From 6c193ece694dc93eb6948f40a135457c9c85d0d6 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Thu, 5 Apr 2007 21:20:57 +0000 Subject: 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 --- pym/emerge/__init__.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'pym/emerge') 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? " + \ -- cgit v1.2.3-1-g7c22