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

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 10d855e70..c9317c31a 100644
--- 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"]) + \