From: Zac Medico <zmedico@gentoo.org>
Date: Sat, 29 Mar 2008 22:47:54 +0000 (-0000)
Subject: When dyn_unpack() automatically cleans ${WORKDIR}, also remove things
X-Git-Tag: v2.2_pre6~305
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f69fb75f3359b7004a5241c9963aae800456a85e;p=portage.git

When dyn_unpack() automatically cleans ${WORKDIR}, also remove things
like .unpacked and .compiled so that the state is consistent.

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

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 8f22fcab3..cc42e8581 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -649,6 +649,7 @@ dyn_unpack() {
 	fi
 	if [ "${newstuff}" == "yes" ]; then
 		# We don't necessarily have privileges to do a full dyn_clean here.
+		rm -rf "${PORTAGE_BUILDDIR}"/{.unpacked,.compiled,.tested,.packaged,build-info}
 		rm -rf "${WORKDIR}"
 		if [ -d "${T}" ] && \
 			! hasq keeptemp $FEATURES && ! hasq keepwork $FEATURES ; then