From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 29 Nov 2007 00:50:07 +0000 (-0000)
Subject: Make dblink.treewalk() properly delete the installed instance after
X-Git-Tag: v2.2_pre1~281
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=dea81e59011f78b4e436f0404970c0fd1aa65808;p=portage.git

Make dblink.treewalk() properly delete the installed instance after
it unmerges it.

svn path=/main/trunk/; revision=8737
---

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