From: Zac Medico <zmedico@gentoo.org>
Date: Sat, 29 Dec 2007 08:57:05 +0000 (-0000)
Subject: Make the ARCH and USERLAND sanity check use the autodetected USERLAND
X-Git-Tag: v2.2_pre1~98
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d394e46477e3329a3de4cf92d1c79edc463fb062;p=portage.git

Make the ARCH and USERLAND sanity check use the autodetected USERLAND
from the portage.data module if necessary.

svn path=/main/trunk/; revision=9089
---

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 31370e325..217db0aa7 100644
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -4538,7 +4538,11 @@ def doebuild(myebuild, mydo, myroot, mysettings, debug=0, listonly=0,
 				mysettings._filter_calling_env = True
 			else:
 				for var in "ARCH", "USERLAND":
-					if mysettings.get(var):
+					value = mysettings.get(var)
+					if value:
+						continue
+					if var == "USERLAND" and userland:
+						mysettings["USERLAND"] = userland
 						continue
 					msg = ("%s is not set... " % var) + \
 						("Are you missing the '%setc/make.profile' symlink? " % \