From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 29 Nov 2007 03:11:18 +0000 (-0000)
Subject: In dblink.treewalk(), make portage unmerge multiple instances
X-Git-Tag: v2.2_pre1~278
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9b9ada2d7ab45567fa063321cfa243963214c37c;p=portage.git

In dblink.treewalk(), make portage unmerge multiple instances
os sys-apps/portage in the same slot if necessary (needed when
AUTOCLEAN=no is set).

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

diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index ff2a1caf2..70a43c5e6 100644
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -2032,7 +2032,8 @@ class dblink(object):
 			# TODO: Check status and abort if necessary.
 			dblnk.delete()
 			writemsg_stdout(">>> Original instance of package unmerged safely.\n")
-			break
+			if not reinstall_self:
+				break
 
 		# We hold both directory locks.
 		self.dbdir = self.dbpkgdir