diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2011-01-31 02:01:48 -0800 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-01-31 02:01:48 -0800 |
| commit | 2a2b9e6485950757c59a1d5aa026d7f875311def (patch) | |
| tree | 05eb53c80c9885802ac1b9eceb7f8cb6c7d55464 /pym/portage/package/ebuild/config.py | |
| parent | getRawMissingKeywords: ACCEPT_KEYWORDS, not ARCH (diff) | |
| download | portage-2a2b9e6485950757c59a1d5aa026d7f875311def.tar.gz portage-2a2b9e6485950757c59a1d5aa026d7f875311def.tar.bz2 portage-2a2b9e6485950757c59a1d5aa026d7f875311def.zip | |
Display: Simplify mask code for bug #58416.
Hopefully this makes the logic more understandable, though it may
support fewer cases. If we want to handle more cases then hopefully
we can do it without making the code too complex.
Diffstat (limited to 'pym/portage/package/ebuild/config.py')
| -rw-r--r-- | pym/portage/package/ebuild/config.py | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/pym/portage/package/ebuild/config.py b/pym/portage/package/ebuild/config.py index 81657aa38..1f943e473 100644 --- a/pym/portage/package/ebuild/config.py +++ b/pym/portage/package/ebuild/config.py @@ -1456,7 +1456,7 @@ class config(object): need to accept for the given package. If the KEYWORDS are empty, the returned list will contain ** alone (in order to distinguish from the case of "none missing"). This DOES NOT apply any user config - keywording acceptance. + package.accept_keywords acceptance. @param cpv: The package name (for package.keywords support) @type cpv: String @@ -1466,15 +1466,9 @@ class config(object): @return: lists of KEYWORDS that have not been accepted and the keywords it looked for. """ - - # 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) - backuped_accept_keywords = self.configdict["backupenv"].get("ACCEPT_KEYWORDS", "") - return self._keywords_manager.getRawMissingKeywords(cpv, metadata["SLOT"], \ metadata.get("KEYWORDS", ""), metadata.get('repository'), \ - self.get("ACCEPT_KEYWORDS", ""), backuped_accept_keywords) + self.get("ACCEPT_KEYWORDS", "")) def _getPKeywords(self, cpv, metadata): global_accept_keywords = self.get("ACCEPT_KEYWORDS", "") |