diff options
| author | Zac Medico <zmedico@gentoo.org> | 2010-11-04 13:10:35 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-11-04 13:10:35 -0700 |
| commit | 4de9e7b29df73489ab47240207846708607063e5 (patch) | |
| tree | 341e57ac9ef2e089ede82d8f6dbc2414fc6acae3 | |
| parent | 99ba5e3b0d2c2019ae0154e56428ee74810bd925 (diff) | |
| download | portage-4de9e7b29df73489ab47240207846708607063e5.tar.gz portage-4de9e7b29df73489ab47240207846708607063e5.tar.bz2 portage-4de9e7b29df73489ab47240207846708607063e5.zip | |
calc_depclean: use depgraph._pkg()
| -rw-r--r-- | pym/_emerge/actions.py | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py index 863e94386..03f7d3130 100644 --- a/pym/_emerge/actions.py +++ b/pym/_emerge/actions.py @@ -1009,11 +1009,11 @@ def calc_depclean(settings, trees, ldpath_mtimes, if len(provider_dblinks) > 1: for provider_dblink in provider_dblinks: - pkg_key = ("installed", myroot, - provider_dblink.mycpv, "nomerge", - "installed") - if pkg_key not in clean_set: - provider_pkgs.add(vardb.get(pkg_key)) + provider_pkg = resolver._pkg( + provider_dblink.mycpv, "installed", + root_config, installed=True) + if provider_pkg not in clean_set: + provider_pkgs.add(provider_pkg) if provider_pkgs: continue @@ -1022,8 +1022,8 @@ def calc_depclean(settings, trees, ldpath_mtimes, lib_consumers.update(owner_set) for consumer_dblink in list(lib_consumers): - if ("installed", myroot, consumer_dblink.mycpv, - "nomerge", "installed") in clean_set: + if resolver._pkg(consumer_dblink.mycpv, "installed", + root_config, installed=True) in clean_set: lib_consumers.remove(consumer_dblink) continue @@ -1074,8 +1074,8 @@ def calc_depclean(settings, trees, ldpath_mtimes, for pkg, consumers in consumer_map.items(): for consumer_dblink in set(chain(*consumers.values())): - consumer_pkg = vardb.get(("installed", myroot, - consumer_dblink.mycpv, "nomerge", "installed")) + consumer_pkg = resolver._pkg(consumer_dblink.mycpv, + "installed", root_config, installed=True) if not resolver._add_pkg(pkg, Dependency(parent=consumer_pkg, priority=UnmergeDepPriority(runtime=True), |