In dblink.treewalk(), handle the case where the current cpv is already installed...

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

diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index e234f00f1266807213ff8795e1be41056aeda000..31834a6284c037a7a1b67c35445ef63b227cf0b8 100644 (file)
--- 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],