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 | |
| parent | Punt the sorted_versions() function in favor of list.sort(vercmp). (diff) | |
| download | portage-multirepo-6c193ece694dc93eb6948f40a135457c9c85d0d6.tar.gz portage-multirepo-6c193ece694dc93eb6948f40a135457c9c85d0d6.tar.bz2 portage-multirepo-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')
| -rw-r--r-- | pym/emerge/__init__.py | 6 | ||||
| -rw-r--r-- | pym/portage/__init__.py | 8 | ||||
| -rw-r--r-- | pym/portage/data.py | 2 |
3 files changed, 4 insertions, 12 deletions
diff --git a/pym/emerge/__init__.py b/pym/emerge/__init__.py index 980eff38..313098ca 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? " + \ diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py index 2b954254..3e09e999 100644 --- a/pym/portage/__init__.py +++ b/pym/portage/__init__.py @@ -914,10 +914,6 @@ class config: # backupenv is for calculated incremental variables. self.backupenv = os.environ.copy() - if not local_config: - # Clean up pollution from portage.data so that it doesn't - # interfere with repoman. - self.backupenv.pop("USERLAND", None) def check_var_directory(varname, var): if not os.path.isdir(var): @@ -1160,10 +1156,6 @@ class config: self.configlist.append(os.environ.copy()) self.configdict["env"]=self.configlist[-1] - if not local_config: - # Clean up pollution from portage.data so that it doesn't - # interfere with repoman. - self.configdict["env"].pop("USERLAND", None) # make lookuplist for loading package.* self.lookuplist=self.configlist[:] diff --git a/pym/portage/data.py b/pym/portage/data.py index 3caef1b2..fbd419b2 100644 --- a/pym/portage/data.py +++ b/pym/portage/data.py @@ -44,8 +44,6 @@ if not lchown: " exist. Please rebuild python.\n", noiselevel=-1) lchown() -os.environ["USERLAND"]=userland - def portage_group_warning(): warn_prefix = bad("*** WARNING *** ") mylines = [ |