From: Zac Medico <zmedico@gentoo.org>
Date: Mon, 27 Sep 2010 23:55:53 +0000 (-0700)
Subject: Fix breakage in depgraph._serialize_tasks() blocker handling due
X-Git-Tag: v2.2_rc89~18
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=85099cf6da203d2d3182200f1734f6ff19fb68e8;p=portage.git

Fix breakage in depgraph._serialize_tasks() blocker handling due
to addition of repo to Package._hash_key.
---

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: