diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-07-30 03:43:18 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-07-30 03:43:18 +0000 |
| commit | d6b4521ad656c51513a5bda6a88b38d714d7fcbd (patch) | |
| tree | b4a537b1940129b6b670e5c08fdf72b68e06c44a /pym | |
| parent | 910d88a742b74e7f2c3eea38a69f1d0a5ade63d9 (diff) | |
| download | portage-d6b4521ad656c51513a5bda6a88b38d714d7fcbd.tar.gz portage-d6b4521ad656c51513a5bda6a88b38d714d7fcbd.tar.bz2 portage-d6b4521ad656c51513a5bda6a88b38d714d7fcbd.zip | |
For bug #181551, support slot deps in package.keywords. (branches/2.1.2 r6791)
svn path=/main/branches/2.1.2.9/; revision=7458
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 68a023089..1e9d104af 100644 --- a/pym/portage.py +++ b/pym/portage.py @@ -6266,13 +6266,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 @@ -6283,7 +6284,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: |