extern/rclone
1
0
Fork 0
mirror of https://github.com/rclone/rclone.git synced 2024-12-22 23:22:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

swift: fix server side copy to empty container with --fast-list

Browse Source 
This was caused by an incorrect error return code from ListR when the
container did not exist.
This commit is contained in:
Nick Craig-Wood 2017-09-14 18:00:00 +01:00
parent 6df12b3f00
commit 8574129892
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
swift/swift.go
View File

@ -360,7 +360,7 @@ type addEntryFn func(fs.DirEntry) error
// list the objects into the function supplied // list the objects into the function supplied
func (f *Fs) list(dir string, recurse bool, fn addEntryFn) error { func (f *Fs) list(dir string, recurse bool, fn addEntryFn) error {
return f.listContainerRoot(f.container, f.root, dir, recurse, func(remote string, object *swift.Object, isDirectory bool) (err error) { err := f.listContainerRoot(f.container, f.root, dir, recurse, func(remote string, object *swift.Object, isDirectory bool) (err error) {
if isDirectory { if isDirectory {
remote = strings.TrimRight(remote, "/") remote = strings.TrimRight(remote, "/")
d := fs.NewDir(remote, time.Time{}).SetSize(object.Bytes) d := fs.NewDir(remote, time.Time{}).SetSize(object.Bytes)
@ -377,6 +377,10 @@ func (f *Fs) list(dir string, recurse bool, fn addEntryFn) error {
} }
return err return err
}) })
if err == swift.ContainerNotFound {
err = fs.ErrorDirNotFound
}
return err
} }
// listDir lists a single directory // listDir lists a single directory
@ -390,9 +394,6 @@ func (f *Fs) listDir(dir string) (entries fs.DirEntries, err error) {
return nil return nil
}) })
if err != nil { if err != nil {
if err == swift.ContainerNotFound {
err = fs.ErrorDirNotFound
}
return nil, err return nil, err
} }
return entries, nil return entries, nil