From: Zac Medico <zmedico@gentoo.org>
Date: Sat, 29 Dec 2007 12:38:13 +0000 (-0000)
Subject: Remove redundant USERLAND sanity check code from doebuild() since
X-Git-Tag: v2.1.4~36
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c2554f48f8668870fe0391e1d05c1677023515da;p=portage.git

Remove redundant USERLAND sanity check code from doebuild() since
it's handled in isolated-functions.sh now. (trunk r9103)

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

diff --git a/pym/portage.py b/pym/portage.py
index 7b7a5bead..c1823e98e 100644
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -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"]) + \