diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-06-10 19:35:15 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-06-10 19:35:15 +0000 |
| commit | 5ae7438dee18228c42b3b36455e7d9f7b3f5904a (patch) | |
| tree | 27acd7b0f15b35dae3a66c252b9cc3dd2c11800a /pym | |
| parent | 861fcf47ac678bc91d9b239594e61e93d9571cb9 (diff) | |
| download | portage-5ae7438dee18228c42b3b36455e7d9f7b3f5904a.tar.gz portage-5ae7438dee18228c42b3b36455e7d9f7b3f5904a.tar.bz2 portage-5ae7438dee18228c42b3b36455e7d9f7b3f5904a.zip | |
For bug #181551, support slot deps in package.keywords. (trunk r6790)
svn path=/main/branches/2.1.2/; revision=6791
Diffstat (limited to 'pym')
| -rw-r--r-- | pym/portage.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/pym/portage.py b/pym/portage.py index c53faafd0..bc2e979b7 100644 --- a/pym/portage.py +++ b/pym/portage.py @@ -6299,13 +6299,14 @@ class portdbapi(dbapi): accept_keywords = self.mysettings["ACCEPT_KEYWORDS"].split() pkgdict = self.mysettings.pkeywordsdict + aux_keys = ["KEYWORDS", "EAPI", "SLOT"] for mycpv in mylist: try: - keys, eapi = self.aux_get(mycpv, ["KEYWORDS", "EAPI"]) + keys, eapi, slot = self.aux_get(mycpv, aux_keys) except KeyError: continue except portage_exception.PortageException, e: - writemsg("!!! Error: aux_get('%s', ['KEYWORDS', 'EAPI'])\n" % \ + writemsg("!!! Error: aux_get('%s', %s)\n" % (mycpv, aux_keys), mycpv, noiselevel=-1) writemsg("!!! %s\n" % str(e), noiselevel=-1) del e @@ -6316,7 +6317,8 @@ class portdbapi(dbapi): match=0 cp = dep_getkey(mycpv) if pkgdict.has_key(cp): - matches = match_to_list(mycpv, pkgdict[cp].keys()) + cpv_slot = "%s:%s" % (mycpv, slot) + matches = match_to_list(cpv_slot, pkgdict[cp].keys()) for atom in matches: pgroups.extend(pkgdict[cp][atom]) if matches: |