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

svn path=/main/branches/2.1.2/; revision=6834

diff --git a/pym/portage.py b/pym/portage.py
index 4a35a7aa3832a959c5152e3003b6abad1483f990..ecb760b2cbab8d092ee7a78810fcdc4eac9bffad 100644 (file)
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -7417,6 +7417,11 @@ class dblink:
 
                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],