summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2007-12-29 19:36:57 +0000
committerZac Medico <zmedico@gentoo.org>2007-12-29 19:36:57 +0000
commit6336ea3ccaf12f14384f8d4d04602ec088ef7bf1 (patch)
tree4269d35533b27dca58653d50d413c5af612726a3
parentd4c853b91f13a320102ae87272f09885857a87cd (diff)
downloadportage-6336ea3ccaf12f14384f8d4d04602ec088ef7bf1.tar.gz
portage-6336ea3ccaf12f14384f8d4d04602ec088ef7bf1.tar.bz2
portage-6336ea3ccaf12f14384f8d4d04602ec088ef7bf1.zip
Fix broken Darwin USERLAND detection.
svn path=/main/trunk/; revision=9116
-rwxr-xr-xbin/isolated-functions.sh3
-rw-r--r--pym/portage/data.py4
2 files changed, 6 insertions, 1 deletions
diff --git a/bin/isolated-functions.sh b/bin/isolated-functions.sh
index 6feb48dd7..6be994db0 100755
--- a/bin/isolated-functions.sh
+++ b/bin/isolated-functions.sh
@@ -380,6 +380,9 @@ if [[ -z ${USERLAND} ]] ; then
*BSD|DragonFly)
export USERLAND="BSD"
;;
+ Darwin)
+ export USERLAND="Darwin"
+ ;;
*)
export USERLAND="GNU"
;;
diff --git a/pym/portage/data.py b/pym/portage/data.py
index 5fc811e43..26bff27e6 100644
--- a/pym/portage/data.py
+++ b/pym/portage/data.py
@@ -13,13 +13,15 @@ ostype=os.uname()[0]
userland = None
if ostype == "DragonFly" or ostype.endswith("BSD"):
userland = "BSD"
+elif ostype == "Darwin":
+ userland = "Darwin"
else:
userland = "GNU"
lchown = getattr(os, "lchown", None)
if not lchown:
- if ostype == "Darwin":
+ if userland == "Darwin":
def lchown(*pos_args, **key_args):
pass
else: