diff options
author | Zac Medico <zmedico@gentoo.org> | 2007-11-29 03:11:18 +0000 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2007-11-29 03:11:18 +0000 |
commit | 9b9ada2d7ab45567fa063321cfa243963214c37c (patch) | |
tree | f0f9ada3fa326b3ae18ecdb501cd0dfb3a124e19 | |
parent | 7bb23cee351987d2ebb0166e5e9cb7e3c5d1590a (diff) | |
download | portage-9b9ada2d7ab45567fa063321cfa243963214c37c.tar.gz portage-9b9ada2d7ab45567fa063321cfa243963214c37c.tar.bz2 portage-9b9ada2d7ab45567fa063321cfa243963214c37c.zip |
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
-rw-r--r-- | pym/portage/dbapi/vartree.py | 3 |
1 files changed, 2 insertions, 1 deletions
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 |