diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-04-13 05:10:26 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-04-13 05:10:26 +0000 |
| commit | aa6708d79d29b571645457d4a00ad63680e91e45 (patch) | |
| tree | 7bcaa9a3f0ed3ffd0c11c13d19b6e15846358fe1 | |
| parent | ebf8c9310bba13af7048ef427a889777749fa640 (diff) | |
| download | portage-aa6708d79d29b571645457d4a00ad63680e91e45.tar.gz portage-aa6708d79d29b571645457d4a00ad63680e91e45.tar.bz2 portage-aa6708d79d29b571645457d4a00ad63680e91e45.zip | |
Add CATEGORY to blacklisted variables since it can interfere with CATEGORY guessing inside doebuild.
svn path=/main/trunk/; revision=6386
| -rw-r--r-- | pym/portage/__init__.py | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py index eab6fe5ba..85140d2ad 100644 --- a/pym/portage/__init__.py +++ b/pym/portage/__init__.py @@ -1162,12 +1162,10 @@ class config: self.lookuplist.reverse() # Blacklist vars that could interfere with portage internals. - for blacklisted in ["PKGUSE", "PORTAGE_CONFIGROOT", "ROOT"]: + for blacklisted in "CATEGORY", "PKGUSE", "PORTAGE_CONFIGROOT", \ + "ROOT": for cfg in self.lookuplist: - try: - del cfg[blacklisted] - except KeyError: - pass + cfg.pop(blacklisted, None) del blacklisted, cfg if target_root is None: |