Tried to enhance the previous fix.

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

diff --git a/lib/libfs.sh b/lib/libfs.sh
index e131d42..317aeb7 100644 (file)
--- a/lib/libfs.sh
+++ b/lib/libfs.sh
@@ -158,7 +158,7 @@ fs_get_descendant_mount_info ()
 fs_fix_unionfs_image_if_hidden ()
 {
        local needlepath needlepath_next
-       needlepath="$1"
+       needlepath=$1
        while :
        do
                find -dx "$needlepath" -maxdepth 0 > /dev/null 2>&1 || :

diff --git a/lib/libmain.sh b/lib/libmain.sh
index e7c186b..9431eeb 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_20180710120655
+       MYVERSION=4.0.0+toward_4.0.1_20180710231919
        COMPATIBLE_VERSIONS='^(4\.[0]\.[0]|4\.[0]\.[0]+(|\+toward_4\.[0]\.[1]+_[0-9]+))$'
 }
 

diff --git a/lib/libpkgsys.sh b/lib/libpkgsys.sh
index 43d82f7..b575e3f 100644 (file)
--- a/lib/libpkgsys.sh
+++ b/lib/libpkgsys.sh
@@ -16,6 +16,7 @@ PKGSYS_AVR_REFETCH_TIMES_FOR_CHKSUMERR=2      #  Number (integer) of retrials for che
 pkgsys_chk_ports_tree_implementation ()
 {
        local var tmp_work
+       fs_fix_unionfs_image_if_hidden "${PORTSDIR}/Mk/bsd.port.mk"
        if [ ! -d "${PORTSDIR}" ]
        then
                message_echo "ERROR: Ports directory ${PORTSDIR} is not found." >&2

diff --git a/lib/libreinstall.sh b/lib/libreinstall.sh
index dff581b..e99a71e 100644 (file)
--- a/lib/libreinstall.sh
+++ b/lib/libreinstall.sh
@@ -394,7 +394,7 @@ reinstall_restore_conflicts ()
                else
                        is_skipped=no
                fi
-               if [ "$is_skipped" = yes ]
+               if [ $is_skipped = yes ]
                then
                        message_echo "INFO: Restoration of a conflict, $origin ($pkg), is avoided because it conflicts with installed packages."
                fi