From: Fabian Groffen <grobian@gentoo.org>
Date: Thu, 5 Apr 2007 20:00:18 +0000 (-0000)
Subject: Completely remove USERLAND setting.  For some reason yet unknown to me
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=4f03348f8f92e482eafcaab4d1defd811ee87d72;p=portage.git

Completely remove USERLAND setting.  For some reason yet unknown to me
python thinks userland="", and the profiles can do this much better than
I can in python.


svn path=/main/branches/prefix/; revision=6337
---

diff --git a/pym/portage/data.py b/pym/portage/data.py
index 4c8836cca..3cebf5335 100644
--- a/pym/portage/data.py
+++ b/pym/portage/data.py
@@ -17,11 +17,6 @@ ostype=os.uname()[0]
 
 lchown = None
 os.environ["XARGS"]="xargs -r"
-# default userland is GNU ...
-userland="GNU"
-# ... but BSD in non-prefix has BSD userland
-if EPREFIX == "" and (ostype.endswith("BSD") or ostype =="DragonFly"):
-	userland="BSD"
 
 # "fix" for lchown on Darwin
 if ostype == "Darwin":
@@ -42,8 +37,6 @@ if not lchown:
 					" exist.  Please rebuild python.\n", noiselevel=-1)
 			lchown()
 
-os.environ["USERLAND"]=userland
-
 def portage_group_warning():
 	warn_prefix = bad("*** WARNING ***  ")
 	mylines = [