github/rclone
1
Fork 0
mirror of https://github.com/rclone/rclone synced 2024-12-28 21:03:45 +01:00
Code Releases Activity

s3: ignore zero length directory markers - fixes #1621

Browse Source
This commit is contained in:
Nick Craig-Wood 2018-03-19 17:41:46 +00:00
parent 911a78ce6d
commit a46f2a9eb7
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
backend/s3/s3.go
View File

@ -549,6 +549,18 @@ func (f *Fs) list(dir string, recurse bool, fn listFn) error {
continue
}
remote := key[rootLength:]
// is this a directory marker?
if strings.HasSuffix(remote, "/") && *object.Size == 0 {
if recurse {
// add a directory in if --fast-list since will have no prefixes
remote = remote[:len(remote)-1]
err = fn(remote, &s3.Object{Key: &remote}, true)
if err != nil {
return err
}
}
continue // skip directory marker
}
err = fn(remote, object, false)
if err != nil {
return err