diff options
author | Zac Medico <zmedico@gentoo.org> | 2010-11-04 12:49:29 -0700 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2010-11-23 17:40:33 -0800 |
commit | 7e05646cfcdc6607d3af7e56de20aca6f402bcc3 (patch) | |
tree | 87018e0b02a077c7cdaaad6f1165071f312a978e | |
parent | 2c1b63964f3951bc78491690e56cbbe1d812e9ad (diff) | |
download | portage-7e05646cfcdc6607d3af7e56de20aca6f402bcc3.tar.gz portage-7e05646cfcdc6607d3af7e56de20aca6f402bcc3.tar.bz2 portage-7e05646cfcdc6607d3af7e56de20aca6f402bcc3.zip |
calc_depclean: fix broken pkg hash keys
This should fix bug 344179. These hash keys were broken by reposyntax
changes.
-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 c75120208..88f0a61d8 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), |