From: Zac Medico <zmedico@gentoo.org>
Date: Tue, 14 Nov 2006 12:14:49 +0000 (-0000)
Subject: Remove useless unmerge() call after collision-protect has prevented anything from... 
X-Git-Tag: v2.1.2~466
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=c9dd6b66478637ef3dc9aea33837c56594a81280;p=portage.git

Remove useless unmerge() call after collision-protect has prevented anything from being merged.

svn path=/main/trunk/; revision=5044
---

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"