summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2006-11-14 12:14:49 +0000
committerZac Medico <zmedico@gentoo.org>2006-11-14 12:14:49 +0000
commitc9dd6b66478637ef3dc9aea33837c56594a81280 (patch)
tree6086d3c0addaa7733c9f1900d724d14a21c179f7
parent3ba185018aebd597f2d8c92da6cbeb0d6aac52ad (diff)
downloadportage-c9dd6b66478637ef3dc9aea33837c56594a81280.tar.gz
portage-c9dd6b66478637ef3dc9aea33837c56594a81280.tar.bz2
portage-c9dd6b66478637ef3dc9aea33837c56594a81280.zip
Remove useless unmerge() call after collision-protect has prevented anything from being merged.
svn path=/main/trunk/; revision=5044
-rw-r--r--pym/portage.py6
1 files changed, 0 insertions, 6 deletions
diff --git a/pym/portage.py b/pym/portage.py
index 44e99d7eb..0188cdc4f 100644
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -6459,12 +6459,6 @@ class dblink:
print
print red("package "+self.cat+"/"+self.pkg+" NOT merged")
print
- # Why is the package already merged here db-wise? Shouldn't be the case
- # only unmerge if it ia new package and has no contents
- if not self.getcontents():
- self.unmerge(ldpath_mtimes=prev_mtimes)
- self.delete()
-
print
print "Searching all installed packages for file collisions..."
print "Press Ctrl-C to Stop"