github/distribution
1
0
Fork 0
mirror of https://github.com/distribution/distribution.git synced 2025-08-31 14:37:56 +00:00
Code Issues Projects Releases Wiki Activity

storagedriver/s3: Simplified conditional in Walk impl

Browse Source
This commit is contained in:
Collin Shoop
2021-06-24 17:47:54 -04:00
parent c83e9ae10a
commit 48e2373d5b
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
registry/storage/driver/s3-aws/s3.go
View File

@@ -1210,12 +1210,10 @@ func (d *driver) doWalk(parentCtx context.Context, objectCount *int64, path, pre
return false
}
if walkDirectories {
if walkInfo.IsDir() {
if err := d.doWalk(ctx, objectCount, *walkInfo.prefix, prefix, walkDirectories, f); err != nil {
retError = err
return false
}
if walkInfo.IsDir() && walkDirectories {
if err := d.doWalk(ctx, objectCount, *walkInfo.prefix, prefix, walkDirectories, f); err != nil {
retError = err
return false
}
}
}