diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2012-05-12 18:07:29 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2012-05-12 18:07:29 -0700 |
| commit | af50fee789e71c1fff0b405db4cf55b618b73466 (patch) | |
| tree | 3ef54d972ef77f01164b57724749d6e491732fea /pym/portage/dbapi | |
| parent | match_from_list: handle Package.UNKNOWN_REPO (diff) | |
| download | portage-af50fee789e71c1fff0b405db4cf55b618b73466.tar.gz portage-af50fee789e71c1fff0b405db4cf55b618b73466.tar.bz2 portage-af50fee789e71c1fff0b405db4cf55b618b73466.zip | |
_pkg_str: add slot and repo attributes
Diffstat (limited to 'pym/portage/dbapi')
| -rw-r--r-- | pym/portage/dbapi/__init__.py | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/pym/portage/dbapi/__init__.py b/pym/portage/dbapi/__init__.py index 96e85cecd..a835d4de8 100644 --- a/pym/portage/dbapi/__init__.py +++ b/pym/portage/dbapi/__init__.py @@ -1,4 +1,4 @@ -# Copyright 1998-2011 Gentoo Foundation +# Copyright 1998-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 __all__ = ["dbapi"] @@ -11,7 +11,7 @@ portage.proxy.lazyimport.lazyimport(globals(), 'portage.dep:match_from_list', 'portage.output:colorize', 'portage.util:cmp_sort_key,writemsg', - 'portage.versions:catsplit,catpkgsplit,vercmp', + 'portage.versions:catsplit,catpkgsplit,vercmp,_pkg_str', ) from portage import os @@ -155,11 +155,13 @@ class dbapi(object): 2) Check enabled/disabled flag states. """ - aux_keys = ["IUSE", "SLOT", "USE"] + aux_keys = ["IUSE", "SLOT", "USE", "repository"] for cpv in cpv_iter: try: metadata = dict(zip(aux_keys, self.aux_get(cpv, aux_keys, myrepo=atom.repo))) + if not metadata["repository"]: + del metadata["repository"] except KeyError: continue @@ -209,7 +211,11 @@ class dbapi(object): elif not self.settings.local_config: # Check masked and forced flags for repoman. - pkg = "%s:%s" % (cpv, metadata["SLOT"]) + if hasattr(cpv, 'slot'): + pkg = cpv + else: + pkg = _pkg_str(cpv, slot=metadata["SLOT"], + repo=metadata.get("repository")) usemask = self.settings._getUseMask(pkg) if usemask.intersection(atom.use.enabled): return False |