diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2007-04-13 05:11:04 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-04-13 05:11:04 +0000 |
| commit | 508ec7a32ebf29ecd595ee339a5e41192624d695 (patch) | |
| tree | 5c348e22010a65d2d92e9dc75ecd0f319c54400e | |
| parent | Use catpkgsplit instead of pkgsplit for consistency with usage elsewhere. (tr... (diff) | |
| download | portage-multirepo-508ec7a32ebf29ecd595ee339a5e41192624d695.tar.gz portage-multirepo-508ec7a32ebf29ecd595ee339a5e41192624d695.tar.bz2 portage-multirepo-508ec7a32ebf29ecd595ee339a5e41192624d695.zip | |
Add CATEGORY to blacklisted variables since it can interfere with CATEGORY guessing inside doebuild. (trunk r6385:6386)
svn path=/main/branches/2.1.2/; revision=6387
| -rw-r--r-- | pym/portage.py | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/pym/portage.py b/pym/portage.py index 23e70e49..1fe608a2 100644 --- a/pym/portage.py +++ b/pym/portage.py @@ -1245,12 +1245,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: |