From a6ee27b1feb932cd7703db533223c78e59d63b9a Mon Sep 17 00:00:00 2001 From: Marius Mauch Date: Sun, 26 Mar 2006 05:54:19 +0000 Subject: for collision-protect also check that only versions with the same slot can overwrite each others files svn path=/main/trunk/; revision=3012 --- pym/portage.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'pym') diff --git a/pym/portage.py b/pym/portage.py index 6d7952a5b..9cc32c7c9 100644 --- a/pym/portage.py +++ b/pym/portage.py @@ -5869,9 +5869,11 @@ class dblink: if self.pkg in otherversions: otherversions.remove(self.pkg) # we already checked this package + myslot = self.settings["SLOT"] for v in otherversions: - # should we check for same SLOT here ? - mypkglist.append(dblink(self.cat,v,destroot,self.settings)) + # only allow versions with same slot to overwrite files + if myslot == db[self.myroot]["vartree"].dbapi.aux_get(self.mycpv, ["SLOT"])[0]: + mypkglist.append(dblink(self.cat,v,destroot,self.settings)) print green("*")+" checking "+str(len(myfilelist))+" files for package collisions" for f in myfilelist: -- cgit v1.2.3-1-g7c22