Fixed command_do_auto_if_incomplete () to work correctly.

 Changes to be committed:
	modified:   lib/chroot/libcommand_do.sh
	modified:   lib/libmain.sh

diff --git a/lib/chroot/libcommand_do.sh b/lib/chroot/libcommand_do.sh
index f7dea4e..167e2f3 100644 (file)
--- a/lib/chroot/libcommand_do.sh
+++ b/lib/chroot/libcommand_do.sh
@@ -64,7 +64,7 @@ portsreinstall -S $opt_quiet $@
 =========================================================
 
 eof
-       chroot "$opt_basedir"/builder "${PROGRAM} -S $opt_quiet $@"
+       chroot "$opt_basedir"/builder /usr/bin/env ${PROGRAM} -S $opt_quiet "$@"
        exitstatus=$?
        echo "$exitstatus" > ${DBDIR}/recent_exit_status
        return $exitstatus
@@ -182,7 +182,7 @@ command_do_auto_if_incomplete ()
        {
                local exitstatus
                message_echo
-               until command_do_chroot_auto "$@" || command_do_chk_unionfs_error_at_chroot
+               until command_do_chroot_auto "$@" || ! command_do_chk_unionfs_error_at_chroot
                do
                        message_echo "INFO: Retrying by re-mounting the file systems for the builder chroot environment." >&2
                        fs_terminate_if_unmount_unavailable

diff --git a/lib/libmain.sh b/lib/libmain.sh
index 6c32522..99e737b 100644 (file)
--- a/lib/libmain.sh
+++ b/lib/libmain.sh
@@ -12,7 +12,7 @@ main_set_version ()
        MYVERSION=4.0.1
        COMPATIBLE_VERSIONS='^(4\.[0]\.[0-1])$'
        # Template for development versions
-       MYVERSION=4.0.0+toward_4.0.1_20180725174853
+       MYVERSION=4.0.0+toward_4.0.1_20180725220511
        COMPATIBLE_VERSIONS='^(4\.[0]\.[0-1]]|4\.[0]\.[0]+(|\+toward_4\.[0]\.[1]+_[0-9]+))$'
 }