Remove redundant USERLAND sanity check code from doebuild() since
authorZac Medico <zmedico@gentoo.org>
Sat, 29 Dec 2007 12:38:13 +0000 (12:38 -0000)
committerZac Medico <zmedico@gentoo.org>
Sat, 29 Dec 2007 12:38:13 +0000 (12:38 -0000)
it's handled in isolated-functions.sh now. (trunk r9103)

svn path=/main/branches/2.1.2/; revision=9104

pym/portage.py

index 7b7a5beadb5383899218e345ed914bcdaa35da46..c1823e98e96394fc81ec82b1b041764cfa8bf52b 100644 (file)
@@ -4508,13 +4508,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"]) + \