diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-04-05 21:20:57 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-04-05 21:20:57 +0000 |
| commit | 6c193ece694dc93eb6948f40a135457c9c85d0d6 (patch) | |
| tree | 79969ffec20d888ee44090b231c55372d871e98a /pym/emerge | |
| parent | 62551a66cc82cfdc426fd533883674035622b4d6 (diff) | |
| download | portage-6c193ece694dc93eb6948f40a135457c9c85d0d6.tar.gz portage-6c193ece694dc93eb6948f40a135457c9c85d0d6.tar.bz2 portage-6c193ece694dc93eb6948f40a135457c9c85d0d6.zip | |
Don't set os.environ["USERLAND"] inside portage.data and rely on USERLAND from the profile instead (bail out if necessary when USERLAND is unset).
svn path=/main/trunk/; revision=6341
Diffstat (limited to 'pym/emerge')
| -rw-r--r-- | pym/emerge/__init__.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pym/emerge/__init__.py b/pym/emerge/__init__.py index 980eff386..313098ca9 100644 --- a/pym/emerge/__init__.py +++ b/pym/emerge/__init__.py @@ -5145,8 +5145,10 @@ def parse_opts(tmpcmdline, silent=False): def validate_ebuild_environment(trees): for myroot in trees: mysettings = trees[myroot]["vartree"].settings - if not mysettings.get("ARCH", None): - print >> sys.stderr, bad("\a!!! ARCH is not set... " + \ + for var in "ARCH", "USERLAND": + if mysettings.get(var): + continue + print >> sys.stderr, bad(("\a!!! %s is not set... " % var) + \ "Are you missing the '%setc/make.profile' symlink?" % \ mysettings["PORTAGE_CONFIGROOT"]) print >> sys.stderr, bad("\a!!! Is the symlink correct? " + \ |