diff options
| author | Zac Medico <zmedico@gentoo.org> | 2012-08-24 21:08:47 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2012-08-24 21:08:47 -0700 |
| commit | 741093a384ff8256965ec4842664216cf911bcb5 (patch) | |
| tree | e5d26f51a5454b8d5a7dafdc375076efa4de93e8 /pym/portage/package/ebuild/config.py | |
| parent | c74972c6b1e30232ab961f0206cdee81b7e4c5f5 (diff) | |
| download | portage-741093a384ff8256965ec4842664216cf911bcb5.tar.gz portage-741093a384ff8256965ec4842664216cf911bcb5.tar.bz2 portage-741093a384ff8256965ec4842664216cf911bcb5.zip | |
_pkg_str: pass in config + metadata with KEYWORDS
This will be needed in order to support stable use.mask/force for
bug #431078.
Diffstat (limited to 'pym/portage/package/ebuild/config.py')
| -rw-r--r-- | pym/portage/package/ebuild/config.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/pym/portage/package/ebuild/config.py b/pym/portage/package/ebuild/config.py index 4d871f428..94c0bbc79 100644 --- a/pym/portage/package/ebuild/config.py +++ b/pym/portage/package/ebuild/config.py @@ -1284,7 +1284,8 @@ class config(object): slot = pkg_configdict["SLOT"] iuse = pkg_configdict["IUSE"] if pkg is None: - cpv_slot = _pkg_str(self.mycpv, slot=slot, repo=repository) + cpv_slot = _pkg_str(self.mycpv, metadata=pkg_configdict, + settings=self) else: cpv_slot = pkg pkginternaluse = [] @@ -1740,9 +1741,10 @@ class config(object): @return: A list of properties that have not been accepted. """ accept_properties = self._accept_properties - if not hasattr(cpv, 'slot'): - cpv = _pkg_str(cpv, slot=metadata["SLOT"], - repo=metadata.get("repository")) + try: + cpv.slot + except AttributeError: + cpv = _pkg_str(cpv, metadata=metadata, settings=self) cp = cpv_getkey(cpv) cpdict = self._ppropertiesdict.get(cp) if cpdict: |