Remove redundant USERLAND sanity check code from doebuild() since

it's handled in isolated-functions.sh now.

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

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 10d855e704492977aea87b721ad2ce6d68695137..c9317c31a0c6361257717b516cca7d5264187708 100644 (file)
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -4537,13 +4537,10 @@ def doebuild(myebuild, mydo, myroot, mysettings, debug=0, listonly=0,
                        if env_stat:
                                mysettings._filter_calling_env = True
                        else:
-                               for var in "ARCH", "USERLAND":
+                               for var in ("ARCH", ):
                                        value = mysettings.get(var)
                                        if value and value.strip():
                                                continue
-                                       if var == "USERLAND" and userland:
-                                               mysettings["USERLAND"] = userland
-                                               continue
                                        msg = ("%s is not set... " % var) + \
                                                ("Are you missing the '%setc/make.profile' symlink? " % \
                                                mysettings["PORTAGE_CONFIGROOT"]) + \