From 99a2eab755150bc2427b644b786b15daeccd6cb5 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Wed, 13 Jun 2007 10:09:43 +0000 Subject: In dblink.treewalk(), handle the case where the current cpv is already installed but it has a different slot (multislot or unapplied slotmove). (trunk r6833) svn path=/main/branches/2.1.2/; revision=6834 --- pym/portage.py | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'pym') diff --git a/pym/portage.py b/pym/portage.py index 4a35a7aa3..ecb760b2c 100644 --- 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], -- cgit v1.2.3-1-g7c22