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 31370e325886b0ed897797914325ab5d8c7e957a..217db0aa7d63433e91e1c979f66f3ffd17a17f47 100644 (file)
--- 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? " % \