From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 27 Mar 2009 04:46:20 +0000 (-0000)
Subject: In dyn_unpack(), don't force a new unpack when the ebuild mtime is newer
X-Git-Tag: v2.2_rc28~5
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=4eb939591b9f5e2daaa0f61d9f4be67e7a4fe987;p=portage.git

In dyn_unpack(), don't force a new unpack when the ebuild mtime is newer
than $WORKDIR, since that may be too touchy. The user can easily call
the clean phase explicitly if they really want it.

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

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index d36c81e0c..04cfe6369 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -655,10 +655,7 @@ dyn_unpack() {
 				break
 			fi
 		done
-		if [ "${EBUILD}" -nt "${WORKDIR}" ] && ! hasq keepwork ${FEATURES} ; then
-			vecho ">>> ${EBUILD} has been updated; recreating WORKDIR..."
-			newstuff="yes"
-		elif [ ! -f "${PORTAGE_BUILDDIR}/.unpacked" ]; then
+		if [ ! -f "${PORTAGE_BUILDDIR}/.unpacked" ] ; then
 			vecho ">>> Not marked as unpacked; recreating WORKDIR..."
 			newstuff="yes"
 		fi