Version 3.0.2+toward_3.0.3_20130731211606

Impoved the refetch process to be in two stages: first retrial without cleaning distfiles, and then second retrial after cleaning distfiles.

	modified:   bin/portsreinstall
	modified:   lib/libreinstall.sh

diff --git a/bin/portsreinstall b/bin/portsreinstall
index dcaf00e..f502a7d 100755 (executable)
--- a/bin/portsreinstall
+++ b/bin/portsreinstall
@@ -15,7 +15,7 @@ APPNAME=`basename "$0"`
 # MYVERSION=3.0.2
 # COMPATIBLE_VERSIONS='^(3\.0\.[0-9]+)$'
 # Template for development versions
-MYVERSION=3.0.2+toward_3.0.3_20130731191210
+MYVERSION=3.0.2+toward_3.0.3_20130731211606
 COMPATIBLE_VERSIONS='^(3\.0\.[0-9]+\+toward_3\.0\.1_[0-9]+|3\.0\.[0-9]+)$'
 MYPREFIX=`dirname "\`dirname \"$0\"\`" | sed 's|/bin$||'`
 MYPREFIX=${MYPREFIX:-/usr/local}

diff --git a/lib/libreinstall.sh b/lib/libreinstall.sh
index 7a9f0e8..f720d35 100644 (file)
--- a/lib/libreinstall.sh
+++ b/lib/libreinstall.sh
@@ -696,31 +696,44 @@ reinstall_exec ()
                fi
                if reinstall_chk_stage FAILED_FETCH
                then
-                       message_echo "INFO: Refetching distfiles for $REINSTALL_ORIGPKGTAG."
-                       if ! reinstall_chk_stage_complete FAILED_FETCH.DISTCLEAN
+                       if ! reinstall_chk_stage_complete FAILED_FETCH.RETRIAL_1
                        then
-                               reinstall_make_anymode distclean || :
-                               reinstall_register_stage_complete FAILED_FETCH.DISTCLEAN
+                               message_echo "INFO: Refetching distfiles for $REINSTALL_ORIGPKGTAG."
+                               {
+                                       reinstall_make_anymode fetch FETCH_ARGS=-Ap &&
+                                               reinstall_make_anymode checksum
+                               } || reinstall_register_stage FAILED_REFETCH_1
+                               reinstall_register_stage_complete FAILED_FETCH.RETRIAL_1
                        fi
-                       if ! reinstall_chk_stage_complete FAILED_FETCH.REFETCH
+                       if reinstall_chk_stage FAILED_REFETCH_1
                        then
-                               if ! reinstall_make_anymode fetch FETCH_ARGS=-Ap
+                               if ! reinstall_chk_stage_complete FAILED_FETCH.RETRIAL_2.DISTCLEAN
                                then
-                                       reinstall_restore_conflicts "$REINSTALL_ORIGIN"
-                                       reinstall_restore_if_temporarily_deinstalled
-                                       reinstall_errproc 'fetch'
-                                       temp_set_msg_current_stage "${_MSG_CURRENT_STAGE_general}"
-                                       return
+                                       message_echo "INFO: Cleaning distfiles for the second refetch for $REINSTALL_ORIGPKGTAG."
+                                       reinstall_make_anymode distclean || :
+                                       reinstall_register_stage_complete FAILED_FETCH.RETRIAL_2.DISTCLEAN
+                               fi
+                               if ! reinstall_chk_stage_complete FAILED_FETCH.RETRIAL_2
+                               then
+                                       message_echo "INFO: Refetching distfiles as the second retrial for $REINSTALL_ORIGPKGTAG."
+                                       if ! reinstall_make_anymode fetch FETCH_ARGS=-Ap
+                                       then
+                                               reinstall_restore_conflicts "$REINSTALL_ORIGIN"
+                                               reinstall_restore_if_temporarily_deinstalled
+                                               reinstall_errproc 'fetch'
+                                               temp_set_msg_current_stage "${_MSG_CURRENT_STAGE_general}"
+                                               return
+                                       fi
+                                       reinstall_make_anymode checksum || \
+                                       {
+                                               reinstall_restore_conflicts "$REINSTALL_ORIGIN"
+                                               reinstall_restore_if_temporarily_deinstalled
+                                               reinstall_errproc 'checksum'
+                                               temp_set_msg_current_stage "${_MSG_CURRENT_STAGE_general}"
+                                               return
+                                       }
+                                       reinstall_register_stage_complete FAILED_FETCH.RETRIAL_2
                                fi
-                               reinstall_make_anymode checksum || \
-                               {
-                                       reinstall_restore_conflicts "$REINSTALL_ORIGIN"
-                                       reinstall_restore_if_temporarily_deinstalled
-                                       reinstall_errproc 'checksum'
-                                       temp_set_msg_current_stage "${_MSG_CURRENT_STAGE_general}"
-                                       return
-                               }
-                               reinstall_register_stage_complete FAILED_FETCH.REFETCH
                        fi
                fi
                reinstall_register_stage_complete FETCH