diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2007-07-30 04:58:06 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-07-30 04:58:06 +0000 |
| commit | 30840450041d2c6a8865eff286cb2ce35f8b773f (patch) | |
| tree | af8dd053a2f9debbfd9c9fa1b06d35954c960e4d | |
| parent | Document RESTRICT=bindist and add a note about allowance for conditional synt... (diff) | |
| download | portage-multirepo-30840450041d2c6a8865eff286cb2ce35f8b773f.tar.gz portage-multirepo-30840450041d2c6a8865eff286cb2ce35f8b773f.tar.bz2 portage-multirepo-30840450041d2c6a8865eff286cb2ce35f8b773f.zip | |
get ACCEPT_KEYWORDS from the env in gvisible() to properly handle negated values (bug #139600) (branches/2.1.2 r6998)
svn path=/main/branches/2.1.2.9/; revision=7481
| -rw-r--r-- | pym/portage.py | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/pym/portage.py b/pym/portage.py index e9d52118..e0c2c000 100644 --- a/pym/portage.py +++ b/pym/portage.py @@ -6284,6 +6284,13 @@ class portdbapi(dbapi): accept_keywords = self.mysettings["ACCEPT_KEYWORDS"].split() pkgdict = self.mysettings.pkeywordsdict aux_keys = ["KEYWORDS", "EAPI", "SLOT"] + + # Hack: Need to check the env directly here as otherwise stacking + # doesn't work properly as negative values are lost in the config + # object (bug #139600) + egroups = self.mysettings.configdict["backupenv"].get( + "ACCEPT_KEYWORDS", "").split() + for mycpv in mylist: try: keys, eapi, slot = self.aux_get(mycpv, aux_keys) @@ -6305,6 +6312,7 @@ class portdbapi(dbapi): matches = match_to_list(cpv_slot, pkgdict[cp].keys()) for atom in matches: pgroups.extend(pkgdict[cp][atom]) + pgroups.extend(egroups) if matches: inc_pgroups = [] for x in pgroups: |