OSDN Git Service

Fixed fs_fix_unionfs_image_if_hidden () about the previous modification.
authorMamoru Sakaue / MwGhennndo <glmwghennndo@users.sourceforge.jp>
Tue, 10 Jul 2018 18:28:42 +0000 (02:28 +0800)
committerMamoru Sakaue / MwGhennndo <glmwghennndo@users.sourceforge.jp>
Tue, 10 Jul 2018 18:28:42 +0000 (02:28 +0800)
 Changes to be committed:
modified:   lib/libfs.sh
modified:   lib/libmain.sh

lib/libfs.sh
lib/libmain.sh

index 8606d85..ab49417 100644 (file)
@@ -157,15 +157,16 @@ fs_get_descendant_mount_info ()
 # Use the side effect of find(1).
 fs_fix_unionfs_image_if_hidden ()
 {
-       local needlepath needlepath_next
+       local needlepath needlepath_cur needlepath_next
        needlepath=$1
+       needlepath_cur=$needlepath
        while :
        do
-               [ -e "$needlepath" ] && return
-               find -dx "$needlepath" -maxdepth 0 > /dev/null 2>&1 || :
-               needlepath_next=`dirname "$needlepath"`
-               [ "x$needlepath" = "x$needlepath_next" ] && break
-               needlepath=$needlepath_next
+               [ -e "$needlepath_cur" ] && return
+               find -dx "$needlepath_cur" -maxdepth 0 > /dev/null 2>&1 || :
+               needlepath_next=`dirname "$needlepath_cur"`
+               [ "x$needlepath_cur" = "x$needlepath_next" ] && break
+               needlepath_cur=$needlepath_next
        done
        [ -e "$needlepath" ] && return
        message_echo "ERROR: Lost mandatory file, probably due to the bug of unionfs: $needlepath" >&2
index 602361f..f094484 100644 (file)
@@ -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_20180711013924
+       MYVERSION=4.0.0+toward_4.0.1_20180711022824
        COMPATIBLE_VERSIONS='^(4\.[0]\.[0]|4\.[0]\.[0]+(|\+toward_4\.[0]\.[1]+_[0-9]+))$'
 }