diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-07-31 04:47:37 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-07-31 04:47:37 +0000 |
| commit | 7a3d6b48da77afbaaaef35f5c3d017554eaccea8 (patch) | |
| tree | 9ca10831f0c396119a78bc96b59a79a60ba04879 | |
| parent | 065ac84eddfa8ef28e2f9811ba366590710d0c1a (diff) | |
| download | portage-7a3d6b48da77afbaaaef35f5c3d017554eaccea8.tar.gz portage-7a3d6b48da77afbaaaef35f5c3d017554eaccea8.tar.bz2 portage-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.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/pym/portage.py b/pym/portage.py index 44de57f01..55d0f791f 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 |