From 058a5fc1b8c757baf2981b0d21191950792a56f6 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sun, 24 Jun 2007 18:33:46 +0000 Subject: get ACCEPT_KEYWORDS from the env in gvisible() to properly handle negated values (bug #139600) (trunk r6981 and r6987) svn path=/main/branches/2.1.2/; revision=6998 --- pym/portage.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pym/portage.py b/pym/portage.py index 9a5ec82f7..d517fa37c 100644 --- a/pym/portage.py +++ b/pym/portage.py @@ -6350,6 +6350,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) @@ -6371,6 +6378,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: -- cgit v1.2.3-1-g7c22