TrueCloudLab/rclone
16
0
Fork 2
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions 1

local: return fs.ErrorDirNot found from About and Purge

Browse source 
Before this a stat error was returned which wasn't very helpful.
This commit is contained in:
Nick Craig-Wood 2020-08-19 18:02:21 +01:00
parent d2ad293fae
commit 52247e9a9f
2 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
backend/local/about_unix.go
View file

@ -4,6 +4,7 @@ package local
import ( import (
"context" "context"
"os"
"syscall" "syscall"
"github.com/pkg/errors" "github.com/pkg/errors"
@ -15,6 +16,9 @@ func (f *Fs) About(ctx context.Context) (*fs.Usage, error) {
var s syscall.Statfs_t var s syscall.Statfs_t
err := syscall.Statfs(f.root, &s) err := syscall.Statfs(f.root, &s)
if err != nil { if err != nil {
if os.IsNotExist(err) {
return nil, fs.ErrorDirNotFound
}
return nil, errors.Wrap(err, "failed to read disk usage") return nil, errors.Wrap(err, "failed to read disk usage")
} }
bs := int64(s.Bsize) // nolint: unconvert bs := int64(s.Bsize) // nolint: unconvert

4
backend/local/local.go
View file

@ -625,6 +625,10 @@ func (f *Fs) Purge(ctx context.Context, dir string) error {
dir = f.localPath(dir) dir = f.localPath(dir)
fi, err := f.lstat(dir) fi, err := f.lstat(dir)
if err != nil { if err != nil {
// already purged
if os.IsNotExist(err) {
return fs.ErrorDirNotFound
}
return err return err
} }
if !fi.Mode().IsDir() { if !fi.Mode().IsDir() {