summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2007-12-29 08:57:05 +0000
committerZac Medico <zmedico@gentoo.org>2007-12-29 08:57:05 +0000
commitd394e46477e3329a3de4cf92d1c79edc463fb062 (patch)
treedbbd460c407860e836ef4f32ab56b3560db035e1
parent752c89b6c715771dd3d2d4b22be22b0bae06d3a0 (diff)
downloadportage-d394e46477e3329a3de4cf92d1c79edc463fb062.tar.gz
portage-d394e46477e3329a3de4cf92d1c79edc463fb062.tar.bz2
portage-d394e46477e3329a3de4cf92d1c79edc463fb062.zip
Make the ARCH and USERLAND sanity check use the autodetected USERLAND
from the portage.data module if necessary. svn path=/main/trunk/; revision=9089
-rw-r--r--pym/portage/__init__.py6
1 files changed, 5 insertions, 1 deletions
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? " % \