Browse Source

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.
pull/3210/head
chrislu 3 years ago
parent
commit
69a2e503ab
  1. 2
      weed/mount/weedfs_dir_mkrm.go

2
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) {

Loading…
Cancel
Save