diff options
| author | Zac Medico <zmedico@gentoo.org> | 2010-09-27 16:55:53 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-09-30 17:47:48 -0700 |
| commit | 5e9feafa13fb91a22acd9f9b36c12362f42e2940 (patch) | |
| tree | 1d21d008ad7bc3103b2d89ca67455b24f7308217 | |
| parent | 6a223e9d7da5567b26196a87517820cd46516ee3 (diff) | |
| download | portage-5e9feafa13fb91a22acd9f9b36c12362f42e2940.tar.gz portage-5e9feafa13fb91a22acd9f9b36c12362f42e2940.tar.bz2 portage-5e9feafa13fb91a22acd9f9b36c12362f42e2940.zip | |
Fix breakage in depgraph._serialize_tasks() blocker handling due
to addition of repo to Package._hash_key.
| -rw-r--r-- | pym/_emerge/depgraph.py | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index 5bb2be288..aa6992f55 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -4330,13 +4330,17 @@ class depgraph(object): uninst_task = node else: vardb = self._frozen_config.trees[node.root]["vartree"].dbapi - previous_cpv = vardb.match(node.slot_atom) - if previous_cpv: + inst_pkg = vardb.match_pkgs(node.slot_atom) + if inst_pkg: # The package will be replaced by this one, so remove # the corresponding Uninstall task if necessary. - previous_cpv = previous_cpv[0] - uninst_task = \ - ("installed", node.root, previous_cpv, "uninstall") + inst_pkg = inst_pkg[0] + uninst_task = Package(built=inst_pkg.built, + cpv=inst_pkg.cpv, installed=inst_pkg.installed, + metadata=inst_pkg.metadata, + operation="uninstall", + root_config=inst_pkg.root_config, + type_name=inst_pkg.type_name) try: mygraph.remove(uninst_task) except KeyError: |