Corrected so as not to show opening messages of portsreinstall launched by portsreins...

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

diff --git a/lib/chroot/libcommand_do.sh b/lib/chroot/libcommand_do.sh
index ed264d7..98f0f77 100644 (file)
--- a/lib/chroot/libcommand_do.sh
+++ b/lib/chroot/libcommand_do.sh
@@ -257,11 +257,11 @@ command_do_main_init_resinst ()
                        opts=
                elif [ $opt_batch_mode = no ]
                then
-                       opts='-CGSjqx'
+                       opts='-CGjqx'
                else
-                       opts='-CGSYajqx'
+                       opts='-CGYajqx'
                fi
-               if ! chroot "$opt_basedir"/builder /usr/bin/env ${PROGRAM} $opts
+               if ! chroot "$opt_basedir"/builder /usr/bin/env ${PROGRAM} -S $opts
                then
                        exitstatus=$?
                        message_echo "INFO: The last exit status in the builder chroot environment was non-zero." >&2

diff --git a/lib/chroot/libfs.sh b/lib/chroot/libfs.sh
index 8e1f476..59ae98f 100644 (file)
--- a/lib/chroot/libfs.sh
+++ b/lib/chroot/libfs.sh
@@ -375,10 +375,11 @@ fs_mount ()
        if fs_chk_mount > /dev/null
        then
                message_echo "The builder chroot environment is already mounted."
+               message_echo
                return
        fi
        fs_terminate_if_mount_unavailable
-       message_echo "Mounting the file systems for builder chroot environment."
+       message_section_title "Mounting the file systems for builder chroot environment."
        fs_gen_fstab mount
        remining=
        if ! mount -F "${DBDIR}/fstab" -a || ! remining=`fs_chk_mount`
@@ -393,6 +394,7 @@ fs_mount ()
                exit 1
        fi
        message_echo "Mounting done."
+       message_echo
 }
 
 # ============= Check whether the file systems for the builder chroot environment are all unmounted or destroyed =============
@@ -479,9 +481,10 @@ fs_unmount ()
        if fs_chk_unmount > /dev/null
        then
                message_echo "The builder chroot environment is already unmounted."
+               message_echo
                return
        fi
-       message_echo "Unmounting the file systems for builder chroot."
+       message_section_title "Unmounting the file systems for builder chroot."
        fs_gen_fstab unmount
        umount -F "${DBDIR}/fstab" -af 2> /dev/null || :
        itrial=${FS_UNMOUNT_RETIAL_MAXNUM}
@@ -504,6 +507,7 @@ fs_unmount ()
        fi
        rm -f "${DBDIR}/fs_systembase"
        message_echo "Unmounting done."
+       message_echo
 }
 
 # ============= Destroy the chroot environment =============

diff --git a/lib/libmain.sh b/lib/libmain.sh
index d4d4eb4..4d9b8f8 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_20180821155953
+       MYVERSION=4.0.0+toward_4.1.0_20180822002826
        COMPATIBLE_VERSIONS='^(4\.[0-1]\.[0-9]]|4\.[0]\.[0]+(|\+toward_4\.[0-1]\.[0-9]+_[0-9]+))$'
 }