From dc669467bfc2abe9a5f9c88f9876940a09289d81 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Fri, 7 Jul 2006 18:02:12 +0000 Subject: [PATCH] Fix the NameError that occurs when collision-protect triggers unmerge. See bug #139580. svn path=/main/trunk/; revision=3811 --- pym/portage.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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) -- 2.26.2