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. (trunk r13222)

svn path=/main/branches/2.1.6/; revision=13223

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index d36c81e0cbe43df7066fa29d7c401c42f190bf9c..04cfe6369bc7fa9323ff0a7fff9b7352f1d5163c 100755 (executable)
--- 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