Replace things like [[ $PORTAGE_BUILDDIR/.prepared -nt $WORKDIR ]] with

simply [[ -e $PORTAGE_BUILDDIR/.prepared ]] since the timestamp of
$WORKDIR is practically always newer due to the other hidden files that are
created there as each phase is executed. Thanks to Alfredo Tupone <tupone@g.o>
for reporting. (trunk r12795)

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

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 2c326d21fa63f0814d5894d65540a2aa08f5abad..1f91a7aaa30134f2845c17aed540d6e133f47f6c 100755 (executable)
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -850,7 +850,7 @@ abort_install() {
 
 dyn_prepare() {
 
-       if [[ $PORTAGE_BUILDDIR/.prepared -nt $WORKDIR ]] ; then
+       if [[ -e $PORTAGE_BUILDDIR/.prepared ]] ; then
                vecho ">>> It appears that '$PF' is already prepared; skipping."
                vecho ">>> Remove '$PORTAGE_BUILDDIR/.prepared' to force prepare."
                return 0
@@ -878,7 +878,7 @@ dyn_prepare() {
 
 dyn_configure() {
 
-       if [[ $PORTAGE_BUILDDIR/.configured -nt $WORKDIR ]] ; then
+       if [[ -e $PORTAGE_BUILDDIR/.configured ]] ; then
                vecho ">>> It appears that '$PF' is already configured; skipping."
                vecho ">>> Remove '$PORTAGE_BUILDDIR/.configured' to force configuration."
                return 0
@@ -902,7 +902,7 @@ dyn_configure() {
 
 dyn_compile() {
 
-       if [[ $PORTAGE_BUILDDIR/.compiled -nt $WORKDIR ]] ; then
+       if [[ -e $PORTAGE_BUILDDIR/.compiled ]] ; then
                vecho ">>> It appears that '${PF}' is already compiled; skipping."
                vecho ">>> Remove '$PORTAGE_BUILDDIR/.compiled' to force compilation."
                return 0
@@ -931,9 +931,8 @@ dyn_test() {
                ! hasq test ${USE} && export USE="${USE} test"
        fi
        [ "$(type -t pre_src_test)" == "function" ] && qa_call pre_src_test
-       if [ "${PORTAGE_BUILDDIR}/.tested" -nt "${WORKDIR}" ]; then
+       if [[ -e $PORTAGE_BUILDDIR/.tested ]] ; then
                vecho ">>> It appears that ${PN} has already been tested; skipping."
-               [ "$(type -t post_src_test)" == "function" ] && qa_call post_src_test
                return
        fi
        trap "abort_test" SIGINT SIGQUIT
@@ -963,7 +962,7 @@ dyn_install() {
        [ -z "$PORTAGE_BUILDDIR" ] && die "${FUNCNAME}: PORTAGE_BUILDDIR is unset"
        if hasq noauto $FEATURES ; then
                rm -f "${PORTAGE_BUILDDIR}/.installed"
-       elif [[ ${PORTAGE_BUILDDIR}/.installed -nt ${WORKDIR} ]] ; then
+       elif [[ -e $PORTAGE_BUILDDIR/.installed ]] ; then
                vecho ">>> It appears that '${PF}' is already installed; skipping."
                vecho ">>> Remove '${PORTAGE_BUILDDIR}/.installed' to force install."
                return 0