[BUG FIX] Meaningless warnings at the end of leave ports are suppressed.

	modified:   portsreinstall
	modified:   portsreinstall.8

diff --git a/portsreinstall b/portsreinstall
index d41bb48..1846161 100755 (executable)
--- a/portsreinstall
+++ b/portsreinstall
@@ -10,7 +10,7 @@
 # ================================================
 
 APPNAME=`basename "$0"`
-MYVERSION=2.2.2
+MYVERSION=2.2.2+toward_2.2.3_20130108123936                                                                                       
 
 PREFIX=${PREFIX:-/usr/local}
 CONFFILE=${PREFIX}/etc/${APPNAME}.conf
@@ -653,7 +653,11 @@ record_success ()
        str_escape_regexp_filter < ${DBDIR}/failed.list | sed "s|^|^|; s|$|$|" > ${TMPDIR}/record_success.grep_failed.list.tmp
        rm_a_line "$origin" "${DBDIR}/todo_after_requirements_succeed.list"
        dbdir_esc=`echo "${DBDIR}/requires/" | sed 's/|/\\|/'`
-       sed "s|^|$dbdir_esc|;s|$|/failed_requirements|" "${DBDIR}/requires/$origin/dependents" | rm_a_line_from_files "$origin"
+       if [ -e "${DBDIR}/requires/$origin/dependents" ]
+       then
+               sed "s|^|$dbdir_esc|;s|$|/failed_requirements|" "${DBDIR}/requires/$origin/dependents" | \
+                       rm_a_line_from_files "$origin"
+       fi
        if [ `grep -m 1 -E -f "${TMPDIR}/record_success.grep_failed.list.tmp" "${DBDIR}/requires/$origin/requires" | wc -l` -eq 0 ]
        then
                add_a_line_if_new "$origin" "${DBDIR}/success.list"
@@ -678,7 +682,11 @@ record_failure ()
        rm_a_line "$origin" "${DBDIR}/success_but_dependencies_failed.list"
        rm_a_line "$origin" "${DBDIR}/todo_after_requirements_succeed.list"
        dbdir_esc=`echo "${DBDIR}/requires/" | sed 's/|/\\|/'`
-       sed "s|^|$dbdir_esc|;s|$|/failed_requirements|" "${DBDIR}/requires/$origin/dependents" | add_a_line_to_files_if_new "$origin"
+       if [ -e "${DBDIR}/requires/$origin/dependents" ]
+       then
+               sed "s|^|$dbdir_esc|;s|$|/failed_requirements|" "${DBDIR}/requires/$origin/dependents" | \
+                       add_a_line_to_files_if_new "$origin"
+       fi
        rm -f "${DBDIR}/requires/$origin/succeeded_once"
        if [ -z "$clean" -o "@$clean" = @clean ]
        then

diff --git a/portsreinstall.8 b/portsreinstall.8
index d8df8cb..06f08fb 100644 (file)
--- a/portsreinstall.8
+++ b/portsreinstall.8
@@ -287,6 +287,9 @@ Configuration file of portupgrade(1).
 .SH HISTORY
 \fBportsreinstall\fR has been developed as below.
 .TP
+2.2.3 (? January 2013)
+[BUG FIX] Meaningless warnings at the end of leave ports are suppressed.
+.TP
 2.2.2 (03 January 2013)
 [BUG FIX] Commands \fBok add\fR and \fBok del\fR failed if no port has reinstalled in the latest do/redo process.