summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2006-07-07 18:02:12 +0000
committerZac Medico <zmedico@gentoo.org>2006-07-07 18:02:12 +0000
commitdc669467bfc2abe9a5f9c88f9876940a09289d81 (patch)
treece2a115218db58e1c6298b35a75be03cc339c1b3
parentb1f2d133e14f3b476a58a1c2d10e033301f995bc (diff)
downloadportage-dc669467bfc2abe9a5f9c88f9876940a09289d81.tar.gz
portage-dc669467bfc2abe9a5f9c88f9876940a09289d81.tar.bz2
portage-dc669467bfc2abe9a5f9c88f9876940a09289d81.zip
Fix the NameError that occurs when collision-protect triggers unmerge. See bug #139580.
svn path=/main/trunk/; revision=3811
-rw-r--r--pym/portage.py2
1 files changed, 1 insertions, 1 deletions
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)