Fix broken Darwin USERLAND detection.

svn path=/main/trunk/; revision=9116

diff --git a/bin/isolated-functions.sh b/bin/isolated-functions.sh
index 6feb48dd741a8bb0bb2d5bc29f9d5333ec96f38c..6be994db0ac512c95c9249169341a0a1885f761f 100755 (executable)
--- 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 5fc811e43d356d7f4122de21be3212d4bb5cebeb..26bff27e61909c38c966a0d5b992e5493bc1bdb9 100644 (file)
--- 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: