From: Zac Medico <zmedico@gentoo.org>
Date: Sat, 29 Dec 2007 19:36:57 +0000 (-0000)
Subject: Fix broken Darwin USERLAND detection.
X-Git-Tag: v2.2_pre1~82
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6336ea3ccaf12f14384f8d4d04602ec088ef7bf1;p=portage.git

Fix broken Darwin USERLAND detection.

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

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: