summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2006-04-14 08:01:28 +0000
committerZac Medico <zmedico@gentoo.org>2006-04-14 08:01:28 +0000
commit61629ca8d68a2afb722c9078b7c75f22277c3e9f (patch)
treec9fb0453b54036d2c3e6d483fdd859c04aac1688
parent86e08bdaf036b7b455514b3b6cde47523e9759f5 (diff)
downloadportage-61629ca8d68a2afb722c9078b7c75f22277c3e9f.tar.gz
portage-61629ca8d68a2afb722c9078b7c75f22277c3e9f.tar.bz2
portage-61629ca8d68a2afb722c9078b7c75f22277c3e9f.zip
Fix collision-protect logic so the correct cpv is used for slot comparison.
svn path=/main/trunk/; revision=3144
-rw-r--r--pym/portage.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/pym/portage.py b/pym/portage.py
index 547085c24..832594431 100644
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -5730,7 +5730,7 @@ class dblink:
myslot = self.settings["SLOT"]
for v in otherversions:
# only allow versions with same slot to overwrite files
- if myslot == db[self.myroot]["vartree"].dbapi.aux_get(self.mycpv, ["SLOT"])[0]:
+ if myslot == db[self.myroot]["vartree"].dbapi.aux_get(v.mycpv, ["SLOT"])[0]:
mypkglist.append(dblink(self.cat,v,destroot,self.settings))
print green("*")+" checking "+str(len(myfilelist))+" files for package collisions"