diff options
| author | chrislu <chris.lu@gmail.com> | 2022-06-20 13:18:08 -0700 |
|---|---|---|
| committer | chrislu <chris.lu@gmail.com> | 2022-06-20 13:18:08 -0700 |
| commit | 69a2e503ab51b3350388525fa778cb0b20cc82ac (patch) | |
| tree | 6421f17c4493bde1c116586f51ce4b227103abc6 | |
| parent | 36931babf9d19dcd3252afa6c0fb8b66bb111d8e (diff) | |
| download | seaweedfs-69a2e503ab51b3350388525fa778cb0b20cc82ac.tar.xz seaweedfs-69a2e503ab51b3350388525fa778cb0b20cc82ac.zip | |
non-recursive directory deletion
fix a problem during git checkout a different version, where updated directories are deleted even though the directory is not empty.
| -rw-r--r-- | weed/mount/weedfs_dir_mkrm.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/weed/mount/weedfs_dir_mkrm.go b/weed/mount/weedfs_dir_mkrm.go index 289a0bc2c..4246f0a4c 100644 --- a/weed/mount/weedfs_dir_mkrm.go +++ b/weed/mount/weedfs_dir_mkrm.go @@ -104,7 +104,7 @@ func (wfs *WFS) Rmdir(cancel <-chan struct{}, header *fuse.InHeader, name string glog.V(3).Infof("remove directory: %v", entryFullPath) ignoreRecursiveErr := true // ignore recursion error since the OS should manage it - err := filer_pb.Remove(wfs, string(dirFullPath), name, true, true, ignoreRecursiveErr, false, []int32{wfs.signature}) + err := filer_pb.Remove(wfs, string(dirFullPath), name, true, false, ignoreRecursiveErr, false, []int32{wfs.signature}) if err != nil { glog.V(0).Infof("remove %s: %v", entryFullPath, err) if strings.Contains(err.Error(), filer.MsgFailDelNonEmptyFolder) { |