diff options
| author | Marius Mauch <genone@gentoo.org> | 2006-03-26 05:54:19 +0000 |
|---|---|---|
| committer | Marius Mauch <genone@gentoo.org> | 2006-03-26 05:54:19 +0000 |
| commit | a6ee27b1feb932cd7703db533223c78e59d63b9a (patch) | |
| tree | 8333c8f5390e01dfbcda981bd1cf2072429fc4e5 | |
| parent | 58a215e83f8b15b1e34b316c66531724561b2416 (diff) | |
| download | portage-a6ee27b1feb932cd7703db533223c78e59d63b9a.tar.gz portage-a6ee27b1feb932cd7703db533223c78e59d63b9a.tar.bz2 portage-a6ee27b1feb932cd7703db533223c78e59d63b9a.zip | |
for collision-protect also check that only versions with the same slot can overwrite each others files
svn path=/main/trunk/; revision=3012
| -rw-r--r-- | pym/portage.py | 6 |
1 files changed, 4 insertions, 2 deletions
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: |