Version 3.0.0+toward_3.0.1_20130610150827

Resetting records in target specification by -O, -T and -t are now applied to the all combinations of dependencies and levels.

	modified:   bin/portsreinstall

diff --git a/bin/portsreinstall b/bin/portsreinstall
index d93ac12..f8872cd 100755 (executable)
--- a/bin/portsreinstall
+++ b/bin/portsreinstall
@@ -15,7 +15,7 @@ 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_20130610124556
+MYVERSION=3.0.0+toward_3.0.1_20130610150827
 COMPATIBLE_VERSIONS='^(3\.0\.0\+toward_3\.0\.1_[0-9]+|3\.0\.[0-9]+)$'
 MYPREFIX=`dirname "\`dirname \"$0\"\`" | sed 's|/bin$||'`
 MYPREFIX=${MYPREFIX:-/usr/local}
@@ -502,6 +502,7 @@ program_exec_and_record_completion REDO_INIT
 PROGRAM_DEPENDS=''
 _program_exec_and_record_completion__operation ()
 {
+       local tag level dbsuffix
        message_section_title "Determining specified targets"
        cat "${DBDIR}/stage.loop_list/target_itself.specified" \
                "${DBDIR}/stage.loop_list/target_dependents.specified" \
@@ -539,24 +540,30 @@ _program_exec_and_record_completion__operation ()
                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
+               for tag in all run build none
+               do
+                       for level in direct full
                        do
-                               nodedir=${DBDIR}/requires/$origin
-                               cat "$nodedir/requirements.$dbsuffix" 2> /dev/null
+                               dbsuffix=$tag.$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
                        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