diff options
author | Zac Medico <zmedico@gentoo.org> | 2007-12-29 12:37:26 +0000 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2007-12-29 12:37:26 +0000 |
commit | 4339607abd5ccafef757a90585d5656c010dff7d (patch) | |
tree | 6ac4e27d5d35ef85f4ee8adc2efe86caa9a2513c | |
parent | a3b5b8c16dbcb5f5057fef56bcdc85ed0ab3ad0b (diff) | |
download | portage-4339607abd5ccafef757a90585d5656c010dff7d.tar.gz portage-4339607abd5ccafef757a90585d5656c010dff7d.tar.bz2 portage-4339607abd5ccafef757a90585d5656c010dff7d.zip |
Remove redundant USERLAND sanity check code from doebuild() since
it's handled in isolated-functions.sh now.
svn path=/main/trunk/; revision=9103
-rw-r--r-- | pym/portage/__init__.py | 5 |
1 files changed, 1 insertions, 4 deletions
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"]) + \ |