Fix the NameError that occurs when collision-protect triggers unmerge. See bug #139580.
authorZac Medico <zmedico@gentoo.org>
Fri, 7 Jul 2006 18:02:12 +0000 (18:02 -0000)
committerZac Medico <zmedico@gentoo.org>
Fri, 7 Jul 2006 18:02:12 +0000 (18:02 -0000)
svn path=/main/trunk/; revision=3811

pym/portage.py

index a132da574bca32c416dd553211089c3fe5cb8a4b..7428162fccc5de669d16cecbf72c2214f0b78b2f 100644 (file)
@@ -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)