From 24bf0167dcce019bcc73f9da221878bfb119829f Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Thu, 29 Nov 2007 03:12:15 +0000 Subject: [PATCH] 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 --- pym/portage.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pym/portage.py b/pym/portage.py index 956ff3518..76df20e70 100644 --- 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 -- 2.26.2