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/branches/2.1.2/; revision=8742

diff --git a/pym/portage.py b/pym/portage.py
index 956ff3518a1b8df54dee4068190e2015a31259ed..76df20e70baf0b6f3e57a0a7fe572466a574db1d 100644 (file)
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -8736,7 +8736,8 @@ class dblink:
                        # 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