From 6336ea3ccaf12f14384f8d4d04602ec088ef7bf1 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sat, 29 Dec 2007 19:36:57 +0000 Subject: Fix broken Darwin USERLAND detection. svn path=/main/trunk/; revision=9116 --- bin/isolated-functions.sh | 3 +++ pym/portage/data.py | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) 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: -- cgit v1.2.3-1-g7c22