Version 3.0.5+toward_3.0.6_20140602101825

[BUG FIX] Messages about failed ports were inappropriate when failed ports were changed to unneeded.

	modified:   bin/portsreinstall
	modified:   lib/libdatabase_query.sh
	modified:   man/portsreinstall.8

diff --git a/bin/portsreinstall b/bin/portsreinstall
index 6ded243..850a2a5 100755 (executable)
--- a/bin/portsreinstall
+++ b/bin/portsreinstall
@@ -15,7 +15,7 @@ APPNAME=`basename "$0"`
 # MYVERSION=3.0.6
 # COMPATIBLE_VERSIONS='^(3\.0\.[0-9]+)$'
 # Template for development versions
-MYVERSION=3.0.5+toward_3.0.6_20140602024014
+MYVERSION=3.0.5+toward_3.0.6_20140602101825
 COMPATIBLE_VERSIONS='^(3\.0\.[0-9]+\+toward_3\.0\.[0-9]+_[0-9]+|3\.0\.[0-9]+)$'
 MYPREFIX=`dirname "\`dirname \"$0\"\`" | sed 's|/bin$||'`
 MYPREFIX=${MYPREFIX:-/usr/local}

diff --git a/lib/libdatabase_query.sh b/lib/libdatabase_query.sh
index 12597c3..b029664 100644 (file)
--- a/lib/libdatabase_query.sh
+++ b/lib/libdatabase_query.sh
@@ -9,6 +9,8 @@
 # ============= Show a list of failed ports with their reasons =============
 database_query_show_list_failure ()
 {
+       local tmp_valid
+       tmp_valid=${TMPDIR}/database_query_show_list_failure:valid
        if [ `cat "${DBDIR}/failed.list" 2> /dev/null | wc -l` -eq 0 ]
        then
                message_echo "INFO: No item is registered in this list."
@@ -19,7 +21,14 @@ database_query_show_list_failure ()
        do
                origin_regexp=`str_escape_regexp "$origin"`
                grep -q -E "^$origin_regexp$" "${DBDIR}/stage.loop_list/ports_to_delete" 2> /dev/null \
-                       && continue
+                       || echo "$origin"
+       done > $tmp_valid
+       if [ `cat "$tmp_valid" 2> /dev/null | wc -l` -eq 0 ]
+       then
+               message_echo "INFO: No valid item is registered in this list."
+               return 1
+       fi
+       while read origin
                note=`cat "${DBDIR}/notes/$origin/note_failtre" 2> /dev/null || :`
                resolved=no
                grep -q -E "^`str_escape_regexp \"$origin\"`$" \
@@ -47,7 +56,7 @@ database_query_show_list_failure ()
                else
                        printf "%s\t%s\t%s\t%s\n" "$origin" "$pkgtag" "$note" "$resolved"
                fi
-       done
+       done < $tmp_valid
        :
 }
 

diff --git a/man/portsreinstall.8 b/man/portsreinstall.8
index 717de9a..dd5cf98 100644 (file)
--- a/man/portsreinstall.8
+++ b/man/portsreinstall.8
@@ -927,6 +927,8 @@ Configuration file of \fBportupgrade\fR(1).
 [BUG FIX] Control sequences in output of the long help by \fB\-H\fR option was not correctly handled in some environment (detected in 10.0-RELEASE).
 .PP
 [BUG FIX] Reload of configuration where replacement rule is changed possibly caused errors in the phase of "Inspection of necessity".
+.PP
+[BUG FIX] Messages about failed ports were inappropriate when failed ports were changed to unneeded.
 .RE
 .TP
 3.0.5 (14 December 2013)