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 4c8836cca7b327f3bc12eb5d9bcb5831184cc824..3cebf5335270aace899a845574767f5cc4e03f09 100644 (file)
--- 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 = [