summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2007-07-31 04:47:37 +0000
committerZac Medico <zmedico@gentoo.org>2007-07-31 04:47:37 +0000
commit7a3d6b48da77afbaaaef35f5c3d017554eaccea8 (patch)
tree9ca10831f0c396119a78bc96b59a79a60ba04879
parentChange the numeric value of DepPriority.MIN to be equal to that of a satisfie... (diff)
downloadportage-multirepo-7a3d6b48da77afbaaaef35f5c3d017554eaccea8.tar.gz
portage-multirepo-7a3d6b48da77afbaaaef35f5c3d017554eaccea8.tar.bz2
portage-multirepo-7a3d6b48da77afbaaaef35f5c3d017554eaccea8.zip
In dblink.treewalk(), handle the case where the current cpv is already installed but it has a different slot (multislot or unapplied slotmove). (branches/2.1.2 r6834)v2.1.2.11
svn path=/main/branches/2.1.2.9/; revision=7532
-rw-r--r--pym/portage.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/pym/portage.py b/pym/portage.py
index 44de57f0..55d0f791 100644
--- 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