Version 3.0.0+toward_3.0.1_20130610103336

[BUG FIX] Options -O, -T and -t did not work for once-succeeded ports.

	modified:   bin/portsreinstall
	modified:   man/portsreinstall.8

diff --git a/bin/portsreinstall b/bin/portsreinstall
index baa336b..d5323f8 100755 (executable)
--- a/bin/portsreinstall
+++ b/bin/portsreinstall
@@ -15,9 +15,9 @@ APPNAME=`basename "$0"`
 # MYVERSION=3.0.0
 # COMPATIBLE_VERSIONS='^(3\.0\.[0-9]+)$'
 # Template for development versions
-MYVERSION=3.0.0+toward_3.0.1_20130609060102
-COMPATIBLE_VERSIONS='^(3\.0\.0\+toward_3\.0\.1_[0-9]+|3\.0\.[0-9]+)$'
 
+COMPATIBLE_VERSIONS='^(3\.0\.0\+toward_3\.0\.1_[0-9]+|3\.0\.[0-9]+)$'
+MYVERSION=3.0.0+toward_3.0.1_20130610103336
 MYPREFIX=`dirname "\`dirname \"$0\"\`" | sed 's|/bin$||'`
 MYPREFIX=${MYPREFIX:-/usr/local}
 LIBDIR=${MYPREFIX}/lib/${APPNAME}
@@ -533,12 +533,32 @@ _program_exec_and_record_completion__operation ()
                cat "${DBDIR}/stage.loop_list/target_itself.specified" \
                        "${DBDIR}/stage.loop_list/target_dependents.specified" \
                        "${DBDIR}/stage.loop_list/target_requirements.specified" \
-                       "${DBDIR}/need.list"  2> /dev/null \
+                       | sort -u > ${TMPDIR}/DETERMINE_SPECIFIED_TARGETS.reset
+               cat "${TMPDIR}/DETERMINE_SPECIFIED_TARGETS.reset" "${DBDIR}/need.list" 2> /dev/null \
                        | sort -u > ${DBDIR}/need.list.tmp
                mv "${DBDIR}/need.list.tmp" "${DBDIR}/need.list"
                sort -u "${DBDIR}/need.list" "${DBDIR}/targets_specified_so_far" \
                        > ${DBDIR}/targets_specified_so_far.tmp
                mv "${DBDIR}/targets_specified_so_far.tmp" "${DBDIR}/targets_specified_so_far"
+               dbsuffix=`options_get_dependency_type`.`options_get_dependency_level`
+               {
+                       cat "${TMPDIR}/DETERMINE_SPECIFIED_TARGETS.reset"
+                       cat "${DBDIR}/stage.loop_list/target_dependents.specified" | while read origin
+                       do
+                               nodedir=${DBDIR}/requires/$origin
+                               cat "$nodedir/dependents.$dbsuffix" 2> /dev/null
+                       done
+                       cat "${DBDIR}/stage.loop_list/target_requirements.specified" | while read origin
+                       do
+                               nodedir=${DBDIR}/requires/$origin
+                               cat "$nodedir/requirements.$dbsuffix" 2> /dev/null
+                       done
+               } | sort -u | while read origin
+               do
+                       fileedit_rm_a_line "$origin" "${DBDIR}/success.$dbsuffix.list"
+                       fileedit_rm_a_line "$origin" "${DBDIR}/todo_after_requirements_succeed.$dbsuffix.list"
+                       rm -f "${DBDIR}/requires/$origin/succeeded_once"
+               done
        fi
        message_echo
 }

diff --git a/man/portsreinstall.8 b/man/portsreinstall.8
index 0d831f5..16895ec 100644 (file)
--- a/man/portsreinstall.8
+++ b/man/portsreinstall.8
@@ -912,6 +912,8 @@ Configuration file of \fBportupgrade\fR(1).
 [BUG FIX] Evaluation of glob patterns which have the form of port origin was inappropriately ambiguous.
 
 [BUG FIX] Reinstallation processes were unintentionally terminated when the backup package creation was unsuccessful.
+
+[BUG FIX] Options \fB\-O\fR, \fB\-T\fR and \fB\-t\fR did not work for once-succeeded ports.
 .TP
 3.0.0 (01 June 2013)
 [NEW] Options of \fB\-a\fR, \fB\-A\fR, \fB\-b\fR, \fB\-B\fR, \fB\-C\fR, \fB\-D\fR, \fB\-g\fR, \fB\-G\fR, \fB\-i\fR, \fB\-I\fR, \fB\-l\fR, \fB\-L\fR, \fB\-M\fR, \fB\-n\fR, \fB\-o\fR, \fB\-O\fR, \fB\-X\fR and \fB\-Y\fR are added (\fB\-X\fR is redefined as a different function).