Fixed a bug to detect requirements build incorrectly.

 Changes to be committed:
	modified:   lib/libmain.sh
	modified:   lib/libreinstall.sh

diff --git a/lib/libmain.sh b/lib/libmain.sh
index e2adde7..9839337 100644 (file)
--- a/lib/libmain.sh
+++ b/lib/libmain.sh
@@ -12,7 +12,7 @@ main_set_version ()
        MYVERSION=4.1.0
        COMPATIBLE_VERSIONS='^(4\.[1]\.[0-9])$'
        # Template for development versions
-       MYVERSION=4.0.0+toward_4.1.0_20180822223450
+       MYVERSION=4.0.0+toward_4.1.0_20180823215600
        COMPATIBLE_VERSIONS='^(4\.[0-1]\.[0-9]]|4\.[0]\.[0]+(|\+toward_4\.[0-1]\.[0-9]+_[0-9]+))$'
 }
 

diff --git a/lib/libreinstall.sh b/lib/libreinstall.sh
index 620765e..cf77fa8 100644 (file)
--- a/lib/libreinstall.sh
+++ b/lib/libreinstall.sh
@@ -1399,10 +1399,12 @@ reinstall_exec_reinstall_build ()
                                fi
                                reinstall_restore_conflicts "$REINSTALL_ORIGIN"
                                reinstall_restore_if_temporarily_deinstalled
-                               if [ `cat "$REINSTALL_DBNODE_DIR/failed_requirements.build.full" 2> /dev/null | wc -l` - eq 0 ]
+                               if [ `cat "$REINSTALL_DBNODE_DIR/failed_requirements.build.full" 2> /dev/null | wc -l` -eq 0 ]
                                then
                                        reinstall_errproc 'build'
                                else
+                                       message_echo "INFO: The build failure might be due to the build failure(s) of the following requirements:"
+                                       message_cat "$REINSTALL_DBNODE_DIR/failed_requirements.build.full"
                                        reinstall_errproc 'requirements build'
                                fi
                                return 1