OSDN Git Service

The message related to the looped dependency diagnosis is improved.
authorMamoru Sakaue / MwGhennndo <glmwghennndo@users.sourceforge.jp>
Tue, 28 Jun 2016 15:56:19 +0000 (00:56 +0900)
committerMamoru Sakaue / MwGhennndo <glmwghennndo@users.sourceforge.jp>
Tue, 28 Jun 2016 15:56:19 +0000 (00:56 +0900)
Changes to be committed:
modified:   bin/portsreinstall
modified:   lib/libdatabase_build.sh

bin/portsreinstall
lib/libdatabase_build.sh

index 6997d31..e8b3685 100755 (executable)
@@ -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_20160629003312
+MYVERSION=3.2.1+toward_3.3.0_20160629005554
 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}
index 3280385..fb639b4 100644 (file)
@@ -643,7 +643,12 @@ database_build_get_complete_recursive_dependency ()
                if grep -Eq "^$origin_esc$" "$tmpdb_parents"
                then
                        loophead=`grep -En "^$origin_esc$" "$tmpdb_parents" | tail -n 1 | cut -d : -f 1`
-                       message_echo 'WARNING: The following loop was found:' >&2
+                       if [ "x$opt_force_continuation_for_looped_dependency" = xno ]
+                       then
+                               message_echo 'ERROR: The following loop was found:' >&2
+                       else
+                               message_echo 'WARNING: The following loop was found:' >&2
+                       fi
                        message_echo "  $origin" >&2
                        sed -n $(($loophead+1)),\$p "$tmpdb_parents" | sed 's/^/  -->/' | message_cat >&2
                        message_echo "  -->$origin" >&2