From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 28 Mar 2008 13:08:45 +0000 (-0000)
Subject: Make dyn_clean() consistent wrt removal of ${PORTAGE_BUILDDIR}/image and
X-Git-Tag: v2.1.5~311
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=659a580a577ade1d8a381d465e51d593d2b0ef1a;p=portage.git

Make dyn_clean() consistent wrt removal of ${PORTAGE_BUILDDIR}/image and
${PORTAGE_BUILDDIR}/.installed since otherwise with FEATURES=keepwork
dyn_install() will not call src_install() as necessary to repopulate
${PORTAGE_BUILDDIR}/image (resulting in install_qa_check failure due
to absence of ${PORTAGE_BUILDDIR}/image). (trunk r9527)

svn path=/main/branches/2.1.2/; revision=9579
---

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index fb2e2a3a5..b9abc4790 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -689,6 +689,7 @@ dyn_clean() {
 	fi
 
 	rm -rf "${PORTAGE_BUILDDIR}/image" "${PORTAGE_BUILDDIR}/homedir"
+	rm -f "${PORTAGE_BUILDDIR}/.installed"
 
 	if ! hasq keeptemp $FEATURES && ! hasq keepwork $FEATURES ; then
 		rm -rf "${T}"
@@ -700,7 +701,6 @@ dyn_clean() {
 		rm -rf "${PORTAGE_BUILDDIR}/.unpacked"
 		rm -rf "${PORTAGE_BUILDDIR}/.compiled"
 		rm -rf "${PORTAGE_BUILDDIR}/.tested"
-		rm -rf "${PORTAGE_BUILDDIR}/.installed"
 		rm -rf "${PORTAGE_BUILDDIR}/.packaged"
 		rm -rf "${PORTAGE_BUILDDIR}/build-info"
 		rm -rf "${WORKDIR}"