Skip to content

"rsync for cloud storage" - Google Drive, S3, Dropbox, Backblaze B2, One Drive, Swift, Hubic, Wasabi, Google Cloud Storage, Azure Blob, Azure Files, Yandex Files

sync: copy dir modtimes even when copyEmptySrcDirs is false - fixes #8317

ll3006c1b414e2cf6d
diff --git a/fs/sync/sync.go b/fs/sync/sync.go
index 7feedfcd7..e30c86ed2 100644
--- a/fs/sync/sync.go
+++ b/fs/sync/sync.go
@@ -1109,23 +1109,17 @@ func (s *syncCopyMove) copyDirMetadata(ctx context.Context, f fs.Fs, dst fs.Dire
if !s.setDirModTimeAfter && equal {
return nil
}
- if s.setDirModTimeAfter && equal {
- newDst = dst
- } else if s.copyEmptySrcDirs {
- if s.setDirMetadata {
+ newDst = dst
+ if !equal {
+ if s.setDirMetadata && s.copyEmptySrcDirs {
newDst, err = operations.CopyDirMetadata(ctx, f, dst, dir, src)
- } else if s.setDirModTime {
- if dst == nil {
- newDst, err = operations.MkdirModTime(ctx, f, dir, src.ModTime(ctx))
- } else {
- newDst, err = operations.SetDirModTime(ctx, f, dst, dir, src.ModTime(ctx))
- }
- } else if dst == nil {
- // Create the directory if it doesn't exist
+ } else if dst == nil && s.setDirModTime && s.copyEmptySrcDirs {
+ newDst, err = operations.MkdirModTime(ctx, f, dir, src.ModTime(ctx))
+ } else if dst == nil && s.copyEmptySrcDirs {
err = operations.Mkdir(ctx, f, dir)
+ } else if dst != nil && s.setDirModTime {
+ newDst, err = operations.SetDirModTime(ctx, f, dst, dir, src.ModTime(ctx))
}
- } else {
- newDst = dst
}
// If we need to set modtime after and we created a dir, then save it for later
if s.setDirModTime && s.setDirModTimeAfter && err == nil {