Remove useless unmerge() call after collision-protect has prevented anything from...
authorZac Medico <zmedico@gentoo.org>
Tue, 14 Nov 2006 12:14:49 +0000 (12:14 -0000)
committerZac Medico <zmedico@gentoo.org>
Tue, 14 Nov 2006 12:14:49 +0000 (12:14 -0000)
svn path=/main/trunk/; revision=5044

pym/portage.py

index 44e99d7eb1ade3c6f85040f26172c96b4c72085e..0188cdc4fa7dcec81a625cee1d175b9f0ab00405 100644 (file)
@@ -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"