diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-12-29 12:38:13 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-12-29 12:38:13 +0000 |
| commit | c2554f48f8668870fe0391e1d05c1677023515da (patch) | |
| tree | a31ea1b3e2e8037ec4380884c110e247e8807057 /pym | |
| parent | e7bc48271f4008a01a97b3ae3d961f8bcba518c8 (diff) | |
| download | portage-c2554f48f8668870fe0391e1d05c1677023515da.tar.gz portage-c2554f48f8668870fe0391e1d05c1677023515da.tar.bz2 portage-c2554f48f8668870fe0391e1d05c1677023515da.zip | |
Remove redundant USERLAND sanity check code from doebuild() since
it's handled in isolated-functions.sh now. (trunk r9103)
svn path=/main/branches/2.1.2/; revision=9104
Diffstat (limited to 'pym')
| -rw-r--r-- | pym/portage.py | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/pym/portage.py b/pym/portage.py index 7b7a5bead..c1823e98e 100644 --- a/pym/portage.py +++ b/pym/portage.py @@ -4508,13 +4508,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"]) + \ |