diff options
| author | Zac Medico <zmedico@gentoo.org> | 2012-10-17 19:09:49 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2012-10-17 19:09:49 -0700 |
| commit | 4f5233d38e2a0f29cd6e9032116730579868a263 (patch) | |
| tree | 840609e6129de59906b6aedd84136853d54b0df2 /pym/_emerge | |
| parent | d25923e5770329b6b692ec2c05bb2dafaa4e7d4c (diff) | |
| download | portage-4f5233d38e2a0f29cd6e9032116730579868a263.tar.gz portage-4f5233d38e2a0f29cd6e9032116730579868a263.tar.bz2 portage-4f5233d38e2a0f29cd6e9032116730579868a263.zip | |
actions.py: use _pkg_str for EAPI 5 sub-slot
Diffstat (limited to 'pym/_emerge')
| -rw-r--r-- | pym/_emerge/actions.py | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py index fb80173c4..fec2dfa55 100644 --- a/pym/_emerge/actions.py +++ b/pym/_emerge/actions.py @@ -1285,11 +1285,8 @@ def action_deselect(settings, trees, opts, atoms): allow_repo=True, allow_wildcard=True)) for cpv in vardb.match(atom): - slot, = vardb.aux_get(cpv, ["SLOT"]) - if not slot: - slot = "0" - expanded_atoms.add(Atom("%s:%s" % \ - (portage.cpv_getkey(cpv), slot))) + pkg = vardb._pkg_str(cpv, None) + expanded_atoms.add(Atom("%s:%s" % (pkg.cp, pkg.slot))) discard_atoms = set() for atom in world_set: @@ -2658,13 +2655,8 @@ def action_uninstall(settings, trees, ldpath_mtimes, if owners: for cpv in owners: - slot = vardb.aux_get(cpv, ['SLOT'])[0] - if not slot: - # portage now masks packages with missing slot, but it's - # possible that one was installed by an older version - atom = portage.cpv_getkey(cpv) - else: - atom = '%s:%s' % (portage.cpv_getkey(cpv), slot) + pkg = vardb._pkg_str(cpv, None) + atom = '%s:%s' % (pkg.cp, pkg.slot) valid_atoms.append(portage.dep.Atom(atom)) else: writemsg_level(("!!! '%s' is not claimed " + \ |