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/dep | |
| 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/dep')
| -rw-r--r-- | pym/portage/dep/dep_check.py | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/pym/portage/dep/dep_check.py b/pym/portage/dep/dep_check.py index d575ab3bc..ecb8a9b4e 100644 --- a/pym/portage/dep/dep_check.py +++ b/pym/portage/dep/dep_check.py @@ -350,14 +350,8 @@ def dep_zapdeps(unreduced, reduced, myroot, use_binaries=0, trees=None): avail_pkg = mydbapi.match(atom.without_use) if avail_pkg: avail_pkg = avail_pkg[-1] # highest (ascending order) - try: - slot = avail_pkg.slot - except AttributeError: - eapi, slot, repo = mydbapi.aux_get(avail_pkg, - ["EAPI", "SLOT", "repository"]) - avail_pkg = _pkg_str(avail_pkg, eapi=eapi, - slot=slot, repo=repo) - avail_slot = Atom("%s:%s" % (atom.cp, slot)) + avail_pkg = mydbapi._pkg_str(avail_pkg, atom.repo) + avail_slot = Atom("%s:%s" % (atom.cp, avail_pkg.slot)) if not avail_pkg: all_available = False all_use_satisfied = False @@ -372,13 +366,8 @@ def dep_zapdeps(unreduced, reduced, myroot, use_binaries=0, trees=None): avail_pkg_use = avail_pkg_use[-1] if avail_pkg_use != avail_pkg: avail_pkg = avail_pkg_use - try: - slot = avail_pkg.slot - except AttributeError: - eapi, slot, repo = mydbapi.aux_get(avail_pkg, - ["EAPI", "SLOT", "repository"]) - avail_pkg = _pkg_str(avail_pkg, - eapi=eapi, slot=slot, repo=repo) + avail_pkg = mydbapi._pkg_str(avail_pkg, atom.repo) + avail_slot = Atom("%s:%s" % (atom.cp, avail_pkg.slot)) slot_map[avail_slot] = avail_pkg highest_cpv = cp_map.get(avail_pkg.cp) |