Treatment of looped dependencies in the stage of reinstallation is fixed to be consid...

Changes to be committed:
	modified:   bin/portsreinstall
	modified:   lib/libdatabase_build.sh
	modified:   lib/libreinstall.sh

diff --git a/bin/portsreinstall b/bin/portsreinstall
index 67ea4dc..7fd4dcd 100755 (executable)
--- a/bin/portsreinstall
+++ b/bin/portsreinstall
@@ -15,7 +15,7 @@ APPNAME=`basename "$0"`
 MYVERSION=3.3.0
 COMPATIBLE_VERSIONS='^(3\.[1-3]\.[0-9]+)$'
 # Template for development versions
-MYVERSION=3.2.1+toward_3.3.0_20160701234032
+MYVERSION=3.2.1+toward_3.3.0_20160704155635
 COMPATIBLE_VERSIONS='^(3\.[1-3]\.[0-9]+\+toward_3\.[1-3]\.[0-9]+_[0-9]+|3\.[1-3]\.[0-9]+)$'
 MYPREFIX=`dirname "\`dirname \"$0\"\`" | sed 's|/bin$||'`
 MYPREFIX=${MYPREFIX:-/usr/local}

diff --git a/lib/libdatabase_build.sh b/lib/libdatabase_build.sh
index d25196a..1217253 100644 (file)
--- a/lib/libdatabase_build.sh
+++ b/lib/libdatabase_build.sh
@@ -673,11 +673,9 @@ database_build_get_complete_recursive_dependency ()
                        message_echo "  -->$origin" >&2
                        if [ "x$opt_disallow_force_continuation_for_looped_dependency" = xyes ]
                        then
-                               message_echo 'Resolve the problem manually if possible, and then restart by executing' >&2
+                               message_echo 'Resolve the problem manually and then retry by executing' >&2
                                message_echo "        ${APPNAME} reset keepopts" >&2
                                message_echo "        ${APPNAME}" >&2
-                               message_echo 'Otherwise, you may attempt a forcible continuation by executing' >&2
-                               message_echo "        ${APPNAME} -f" >&2
                                exit 1
                        else
                                message_echo 'Exploring a node port to terminate the loop by evaluating only build-and-run-time dependencies as essential ones.' >&2

diff --git a/lib/libreinstall.sh b/lib/libreinstall.sh
index dc1f62b..428b1ce 100644 (file)
--- a/lib/libreinstall.sh
+++ b/lib/libreinstall.sh
@@ -512,9 +512,10 @@ reinstall_tell_update_to_depandents ()
                for level in full direct
                do
                        dbsuffix=${tag}.${level}
-                       cat "$REINSTALL_DBNODE_DIR/dependents.$dbsuffix" "$REINSTALL_DBNODE_DIR/dependents.$dbsuffix.orig" \
-                               "$REINSTALL_DBNODE_DIR/ignored_dependents.$tag" "$REINSTALL_DBNODE_DIR/ignored_dependents.$tag.orig" \
-                               2> /dev/null \
+                       {
+                               cat "$REINSTALL_DBNODE_DIR/dependents.$dbsuffix" "$REINSTALL_DBNODE_DIR/dependents.$dbsuffix.orig"
+                               [ -e "$REINSTALL_DBNODE_DIR/succeeded_once" ] || cat "$REINSTALL_DBNODE_DIR/ignored_dependents.$tag" "$REINSTALL_DBNODE_DIR/ignored_dependents.$tag.orig"
+                       } 2> /dev/null \
                                | sort -u \
                                | while read origin_dependent
                        do