From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 7 Jul 2006 18:02:12 +0000 (-0000)
Subject: Fix the NameError that occurs when collision-protect triggers unmerge. See bug #139580.
X-Git-Tag: v2.1.1~268
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=dc669467bfc2abe9a5f9c88f9876940a09289d81;p=portage.git

Fix the NameError that occurs when collision-protect triggers unmerge. See bug #139580.

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

diff --git a/pym/portage.py b/pym/portage.py
index a132da574..7428162fc 100644
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -6239,7 +6239,7 @@ class dblink:
 				# 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()
+					self.unmerge(ldpath_mtimes=prev_mtimes)
 					self.delete()
 				self.unlockdb()
 				sys.exit(1)