diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-06-10 19:28:31 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-06-10 19:28:31 +0000 |
| commit | ccb58dbe01f8063f686ef2a686a460b8fe699b8a (patch) | |
| tree | 3b009a5abc009dc960ba6c91e00dd6289f313381 /pym | |
| parent | c4ca6fa5d1ea185753067034c5c0fcaa270534ad (diff) | |
| download | portage-ccb58dbe01f8063f686ef2a686a460b8fe699b8a.tar.gz portage-ccb58dbe01f8063f686ef2a686a460b8fe699b8a.tar.bz2 portage-ccb58dbe01f8063f686ef2a686a460b8fe699b8a.zip | |
For bug #181551, support slot deps in package.keywords.
svn path=/main/trunk/; revision=6790
Diffstat (limited to 'pym')
| -rw-r--r-- | pym/portage/dbapi/porttree.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/pym/portage/dbapi/porttree.py b/pym/portage/dbapi/porttree.py index 9a26e038e..0f23ce70e 100644 --- a/pym/portage/dbapi/porttree.py +++ b/pym/portage/dbapi/porttree.py @@ -648,10 +648,10 @@ class portdbapi(dbapi): accept_keywords = self.mysettings["ACCEPT_KEYWORDS"].split() pkgdict = self.mysettings.pkeywordsdict - aux_keys = ["KEYWORDS", "LICENSE", "EAPI"] + aux_keys = ["KEYWORDS", "LICENSE", "EAPI", "SLOT"] for mycpv in mylist: try: - keys, licenses, eapi = self.aux_get(mycpv, aux_keys) + keys, licenses, eapi, slot = self.aux_get(mycpv, aux_keys) except KeyError: continue except PortageException, e: @@ -666,7 +666,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: |