diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-12-29 12:17:02 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-12-29 12:17:02 +0000 |
| commit | e7bc48271f4008a01a97b3ae3d961f8bcba518c8 (patch) | |
| tree | d22df936a3b6b1d55e8de0a2d7f80cb8c18f1dfe /pym | |
| parent | c3a6e5fa897533274077b7573a6d2a302011be68 (diff) | |
| download | portage-e7bc48271f4008a01a97b3ae3d961f8bcba518c8.tar.gz portage-e7bc48271f4008a01a97b3ae3d961f8bcba518c8.tar.bz2 portage-e7bc48271f4008a01a97b3ae3d961f8bcba518c8.zip | |
* Remove redundant lchown() compatibility code since the
getattr(os, "lchown", None) call already handles it.
* Simplify the userland detection code in portage.data and add
a bash version of it to isolated-functions.sh.
(trunk r9098:9101)
svn path=/main/branches/2.1.2/; revision=9102
Diffstat (limited to 'pym')
| -rw-r--r-- | pym/portage_data.py | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/pym/portage_data.py b/pym/portage_data.py index 3421d9b9d..0e996fa06 100644 --- a/pym/portage_data.py +++ b/pym/portage_data.py @@ -13,24 +13,18 @@ from output import create_color_func bad = create_color_func("BAD") ostype=os.uname()[0] - userland = None +if ostype == "DragonFly" or ostype.endswith("BSD"): + userland = "BSD" +else: + userland = "GNU" + lchown = getattr(os, "lchown", None) -if ostype == "Linux" or \ - ostype.lower().startswith("gnu") or \ - ostype.lower().endswith("gnu"): - userland="GNU" -elif ostype == "Darwin": - userland="Darwin" - def lchown(*pos_args, **key_args): - pass -elif ostype.endswith("BSD") or ostype =="DragonFly": - userland="BSD" if not lchown: - if "lchown" in dir(os): - # Included in python-2.3 - lchown = os.lchown + if ostype == "Darwin": + def lchown(*pos_args, **key_args): + pass else: try: import missingos |