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 ff2a1caf2796bbda574328e0f7a6c57b165bdd40..70a43c5e69243bce78dd56b13e7786848ee726a5 100644 (file)
--- 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