[patch] run dyn_clean instead of just `rm -rf $WORKDIR`, but respect FEATURES=keepwork

really_clean.patch (text/plain), 1001 bytes, created by Zac Medico on 2006-12-07 02:14:52 UTC

Index: bin/ebuild.sh
===================================================================
--- bin/ebuild.sh	(revision 5202)
+++ bin/ebuild.sh	(working copy)
@@ -683,10 +683,11 @@
 				break
 			fi
 		done
-		if [ "${EBUILD}" -nt "${WORKDIR}" ]; then
+		if [ "${EBUILD}" -nt "${WORKDIR}" ] && \
+			! hasq keepwork ${FEATURES} ; then
 			vecho ">>> ${EBUILD} has been updated; recreating WORKDIR..."
 			newstuff="yes"
-			rm -rf "${WORKDIR}"
+			dyn_clean keep_distdir
 		elif [ ! -f "${PORTAGE_BUILDDIR}/.unpacked" ]; then
 			vecho ">>> Not marked as unpacked; recreating WORKDIR..."
 			newstuff="yes"
@@ -752,7 +753,7 @@
 
 	# do not bind this to doebuild defined DISTDIR; don't trust doebuild, and if mistakes are made it'll
 	# result in it wiping the users distfiles directory (bad).
-	rm -rf "${PORTAGE_BUILDDIR}/distdir"
+	! hasq keep_distdir $* && rm -rf "${PORTAGE_BUILDDIR}/distdir"
 
 	if [ -z "$(find "${PORTAGE_BUILDDIR}" -mindepth 1 -maxdepth 1)" ]; then
 		rmdir "${PORTAGE_BUILDDIR}"