A codeing mistake was fixed, although not tested yet.

	modified:   portsreinstall
	modified:   portsreinstall~

diff --git a/portsreinstall b/portsreinstall
index f8f4a52..e8137bb 100755 (executable)
--- a/portsreinstall
+++ b/portsreinstall
@@ -10,7 +10,7 @@
 # ================================================
 
 APPNAME=`basename "$0"`
-MYVERSION=2.2.0+toward_2.2.1_20121222223545
+MYVERSION=2.2.0+toward_2.2.1_20121222225629
 
 PREFIX=${PREFIX:-/usr/local}
 CONFFILE=${PREFIX}/etc/${APPNAME}.conf
@@ -2412,21 +2412,26 @@ then
                then
                        if [ ! -e "${DBDIR}/requires/$origin/need_reinstall_due_to_updated_requirements" ]
                        then
-                               sort -u "${DBDIR}/requires/$origin/failed_requirements" > ${TMPDIR}/failed_requirements.new
-                               sort -u "${DBDIR}/requires/$origin/failed_requirements.previous" > ${TMPDIR}/failed_requirements.old
-                               if [ ! -e "${DBDIR}/requires/$origin/failed_requirements" ] || \
-                                       diff "${TMPDIR}/failed_requirements.old" "${TMPDIR}/failed_requirements.new" \
-                                       > ${TMPDIR}/failed_requirements.diff
+                               if [ ! -e "${DBDIR}/requires/$origin/failed_requirements.previous" ]
                                then
                                        need_update=no
-                               elif grep -m 1 '^<' "${TMPDIR}/failed_requirements.diff" > /dev/null
-                                       need_update=yes
                                else
-                                       need_update=no
+                                       sort -u "${DBDIR}/requires/$origin/failed_requirements" > ${TMPDIR}/failed_requirements.new
+                                       sort -u "${DBDIR}/requires/$origin/failed_requirements.previous" > ${TMPDIR}/failed_requirements.old
+                                       if diff "${TMPDIR}/failed_requirements.old" "${TMPDIR}/failed_requirements.new" \
+                                               > ${TMPDIR}/failed_requirements.diff
+                                       then
+                                               need_update=no
+                                       elif grep -m 1 '^<' "${TMPDIR}/failed_requirements.diff" > /dev/null
+                                       then
+                                               need_update=yes
+                                       else
+                                               need_update=no
+                                       fi
                                fi
                                if [ $need_update = no ]
                                then
-                                       echo "========== $counter (Skipping a port, $position_msg, because itself and the all of its requirements are already latest or failed in update at `timestamp`) =========="
+                                       echo "========== $counter (Skipping a port, $position_msg, because itself and the all of its requirements are already latest or left failed in update at `timestamp`) =========="
                                        echo
                                        add_a_line_if_new "$origin" "${DBDIR}/todo_after_requirements_succeed.list"
                                        rm_a_line "$origin" "${DBDIR}/reinst_todo.list"

diff --git a/portsreinstall~ b/portsreinstall~
index 1dcba45..97f1757 100755 (executable)
--- a/portsreinstall~
+++ b/portsreinstall~
@@ -10,7 +10,7 @@
 # ================================================
 
 APPNAME=`basename "$0"`
-MYVERSION=2.2.0
+MYVERSION=2.2.0+toward_2.2.1_20121222223545
 
 PREFIX=${PREFIX:-/usr/local}
 CONFFILE=${PREFIX}/etc/${APPNAME}.conf
@@ -2412,21 +2412,26 @@ then
                then
                        if [ ! -e "${DBDIR}/requires/$origin/need_reinstall_due_to_updated_requirements" ]
                        then
-                               sort -u "${DBDIR}/requires/$origin/failed_requirements" > ${TMPDIR}/failed_requirements.new
-                               sort -u "${DBDIR}/requires/$origin/failed_requirements.previous" > ${TMPDIR}/failed_requirements.old
-                               if [ ! -e "${DBDIR}/requires/$origin/failed_requirements" ] || \
-                                       diff "${TMPDIR}/failed_requirements.old" "${TMPDIR}/failed_requirements.new" \
-                                       > ${TMPDIR}/failed_requirements.diff
+                               if [ ! -e "${DBDIR}/requires/$origin/failed_requirements.previous" ]
                                then
                                        need_update=no
-                               elif grep -m 1 '^<' "${TMPDIR}/failed_requirements.diff" > /dev/null
-                                       need_update=yes
                                else
-                                       need_update=no
+                                       sort -u "${DBDIR}/requires/$origin/failed_requirements" > ${TMPDIR}/failed_requirements.new
+                                       sort -u "${DBDIR}/requires/$origin/failed_requirements.previous" > ${TMPDIR}/failed_requirements.old
+                                       if diff "${TMPDIR}/failed_requirements.old" "${TMPDIR}/failed_requirements.new" \
+                                               > ${TMPDIR}/failed_requirements.diff
+                                       then
+                                               need_update=no
+                                       elif grep -m 1 '^<' "${TMPDIR}/failed_requirements.diff" > /dev/null
+                                       then
+                                               need_update=yes
+                                       else
+                                               need_update=no
+                                       fi
                                fi
                                if [ $need_update = no ]
                                then
-                                       echo "========== $counter (Skipping a port, $position_msg, because itself and the all of its requirements are already latest or failed in update at `timestamp`) =========="
+                                       echo "========== $counter (Skipping a port, $position_msg, because itself and the all of its requirements are already latest or left failed in update at `timestamp`) =========="
                                        echo
                                        add_a_line_if_new "$origin" "${DBDIR}/todo_after_requirements_succeed.list"
                                        rm_a_line "$origin" "${DBDIR}/reinst_todo.list"