summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2007-11-29 00:50:07 +0000
committerZac Medico <zmedico@gentoo.org>2007-11-29 00:50:07 +0000
commitdea81e59011f78b4e436f0404970c0fd1aa65808 (patch)
tree906ed779cea7ec6c90f952e68e02219eccd2876f
parentfd436e1733d5981f47ee388f0a76ddeb342c8fc8 (diff)
downloadportage-dea81e59011f78b4e436f0404970c0fd1aa65808.tar.gz
portage-dea81e59011f78b4e436f0404970c0fd1aa65808.tar.bz2
portage-dea81e59011f78b4e436f0404970c0fd1aa65808.zip
Make dblink.treewalk() properly delete the installed instance after
it unmerges it. svn path=/main/trunk/; revision=8737
-rw-r--r--pym/portage/dbapi/vartree.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index 5b64fd76a..ff2a1caf2 100644
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -2029,6 +2029,8 @@ class dblink(object):
others_in_slot.remove(dblnk) # dblnk will unmerge itself now
dblnk.unmerge(trimworld=0, ldpath_mtimes=prev_mtimes,
others_in_slot=others_in_slot)
+ # TODO: Check status and abort if necessary.
+ dblnk.delete()
writemsg_stdout(">>> Original instance of package unmerged safely.\n")
break