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

svn path=/main/branches/2.1.2.9/; revision=7532

diff --git a/pym/portage.py b/pym/portage.py
index 44de57f01929845c7f34824dbd122fc1aed35ca0..55d0f791f52f6e6fa39221f4d697121b780e7e67 100644 (file)
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -7435,6 +7435,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)
+
                if slot_matches:
                        # Used by self.isprotected().
                        max_cpv = None