gsh-digital-services/seaweedFS
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

non-recursive directory deletion

Browse Source 
fix a problem during git checkout a different version, where updated directories are deleted even though the directory is not empty.
This commit is contained in:
chrislu
2022-06-20 13:18:08 -07:00
parent 36931babf9
commit 69a2e503ab
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
weed/mount/weedfs_dir_mkrm.go
View File

@@ -104,7 +104,7 @@ func (wfs *WFS) Rmdir(cancel <-chan struct{}, header *fuse.InHeader, name string
glog.V(3).Infof("remove directory: %v", entryFullPath) glog.V(3).Infof("remove directory: %v", entryFullPath)
ignoreRecursiveErr := true // ignore recursion error since the OS should manage it 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 { if err != nil {
glog.V(0).Infof("remove %s: %v", entryFullPath, err) glog.V(0).Infof("remove %s: %v", entryFullPath, err)
if strings.Contains(err.Error(), filer.MsgFailDelNonEmptyFolder) { if strings.Contains(err.Error(), filer.MsgFailDelNonEmptyFolder) {