diff options
| author | Zac Medico <zmedico@gentoo.org> | 2012-10-17 17:11:37 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2012-10-17 17:11:37 -0700 |
| commit | 8bf4b16ee1e3d5ecf58ce20f19563947bfa917d7 (patch) | |
| tree | 0ffc5a707c52ec0fdbc8a995cbcc05ecce4ded5c /pym/_emerge/create_world_atom.py | |
| parent | 873deb19db6bdc1201b83f44f85da0d44962b98b (diff) | |
| download | portage-8bf4b16ee1e3d5ecf58ce20f19563947bfa917d7.tar.gz portage-8bf4b16ee1e3d5ecf58ce20f19563947bfa917d7.tar.bz2 portage-8bf4b16ee1e3d5ecf58ce20f19563947bfa917d7.zip | |
create_world_atom: account for EAPI 5 sub-slot
Diffstat (limited to 'pym/_emerge/create_world_atom.py')
| -rw-r--r-- | pym/_emerge/create_world_atom.py | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/pym/_emerge/create_world_atom.py b/pym/_emerge/create_world_atom.py index 35fb7c4bd..3e05c6d74 100644 --- a/pym/_emerge/create_world_atom.py +++ b/pym/_emerge/create_world_atom.py @@ -1,4 +1,4 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 from portage.dep import _repo_separator @@ -35,8 +35,7 @@ def create_world_atom(pkg, args_set, root_config): for cpv in portdb.match(cp): for repo in repos: try: - available_slots.add(portdb.aux_get(cpv, ["SLOT"], - myrepo=repo)[0]) + available_slots.add(portdb._pkg_str(cpv, repo).slot) except KeyError: pass @@ -44,7 +43,7 @@ def create_world_atom(pkg, args_set, root_config): (len(available_slots) == 1 and "0" not in available_slots) if not slotted: # check the vdb in case this is multislot - available_slots = set(vardb.aux_get(cpv, ["SLOT"])[0] \ + available_slots = set(vardb._pkg_str(cpv, None).slot \ for cpv in vardb.match(cp)) slotted = len(available_slots) > 1 or \ (len(available_slots) == 1 and "0" not in available_slots) @@ -83,13 +82,12 @@ def create_world_atom(pkg, args_set, root_config): matched_slots = set() if mydb is vardb: for cpv in matches: - matched_slots.add(mydb.aux_get(cpv, ["SLOT"])[0]) + matched_slots.add(mydb._pkg_str(cpv, None).slot) else: for cpv in matches: for repo in repos: try: - matched_slots.add(portdb.aux_get(cpv, ["SLOT"], - myrepo=repo)[0]) + matched_slots.add(portdb._pkg_str(cpv, repo).slot) except KeyError: pass |