From: Zac Medico <zmedico@gentoo.org>
Date: Wed, 13 Jun 2007 10:09:06 +0000 (-0000)
Subject: In dblink.treewalk(), handle the case where the current cpv is already installed... 
X-Git-Tag: v2.2_pre1~1246
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=69fbce664e8fbd9043e85c8680afae4d41a60923;p=portage.git

In dblink.treewalk(), handle the case where the current cpv is already installed but it has a different slot (multislot or unapplied slotmove).

svn path=/main/trunk/; revision=6833
---

diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index e234f00f1..31834a628 100644
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -1562,6 +1562,11 @@ class dblink(object):
 
 		slot_matches = self.vartree.dbapi.match(
 			"%s:%s" % (self.mysplit[0], self.settings["SLOT"]))
+		if self.mycpv not in slot_matches and \
+			self.vartree.dbapi.cpv_exists(self.mycpv):
+			# handle multislot or unapplied slotmove
+			slot_matches.append(self.mycpv)
+
 		others_in_slot = []
 		for cur_cpv in slot_matches:
 			others_in_slot.append(dblink(self.cat, catsplit(cur_cpv)[1],