summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2009-03-27 04:46:20 +0000
committerZac Medico <zmedico@gentoo.org>2009-03-27 04:46:20 +0000
commit4eb939591b9f5e2daaa0f61d9f4be67e7a4fe987 (patch)
treefa0e9437123a56db7f46e4b9ce4b63313687424c
parent1886ae22a3c5d004dce4b8307fba4f1c62569d9c (diff)
downloadportage-4eb939591b9f5e2daaa0f61d9f4be67e7a4fe987.tar.gz
portage-4eb939591b9f5e2daaa0f61d9f4be67e7a4fe987.tar.bz2
portage-4eb939591b9f5e2daaa0f61d9f4be67e7a4fe987.zip
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
-rwxr-xr-xbin/ebuild.sh5
1 files changed, 1 insertions, 4 deletions
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