diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2010-11-04 12:49:29 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-11-04 12:49:29 -0700 |
| commit | 99ba5e3b0d2c2019ae0154e56428ee74810bd925 (patch) | |
| tree | 5a1147559ecf63eacd512cb0ddf1b180f0779d41 /pym/_emerge/actions.py | |
| parent | Add note about reposyntax enhancements. (diff) | |
| download | portage-99ba5e3b0d2c2019ae0154e56428ee74810bd925.tar.gz portage-99ba5e3b0d2c2019ae0154e56428ee74810bd925.tar.bz2 portage-99ba5e3b0d2c2019ae0154e56428ee74810bd925.zip | |
calc_depclean: fix broken pkg hash keys
This should fix bug 344179. These hash keys were broken by reposyntax
changes.
Diffstat (limited to 'pym/_emerge/actions.py')
| -rw-r--r-- | pym/_emerge/actions.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py index 955aa0f0e..863e94386 100644 --- a/pym/_emerge/actions.py +++ b/pym/_emerge/actions.py @@ -1010,7 +1010,8 @@ 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") + provider_dblink.mycpv, "nomerge", + "installed") if pkg_key not in clean_set: provider_pkgs.add(vardb.get(pkg_key)) @@ -1022,7 +1023,7 @@ def calc_depclean(settings, trees, ldpath_mtimes, for consumer_dblink in list(lib_consumers): if ("installed", myroot, consumer_dblink.mycpv, - "nomerge") in clean_set: + "nomerge", "installed") in clean_set: lib_consumers.remove(consumer_dblink) continue @@ -1074,7 +1075,7 @@ 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")) + consumer_dblink.mycpv, "nomerge", "installed")) if not resolver._add_pkg(pkg, Dependency(parent=consumer_pkg, priority=UnmergeDepPriority(runtime=True), |