KurlesHS/rclone
1
0
Fork 0
forked from TrueCloudLab/rclone
Code Pull requests Activity

operations: fix pcloud can't set modified time

Browse source 
Before this change we tested special errors for straight equality.

This works for all normal backends, but the union backend may return
wrapped errors which contain the special error types.

In particular if a pcloud backend was part of a union when attempting
to set modification times the fs.ErrorCantSetModTime return wasn't
understood because it was wrapped in a union.Error.

This fixes the problem by using errors.Is instead in all the
comparisons in operations.

See: https://forum.rclone.org/t/failed-to-set-modification-time-1-error-pcloud-cant-set-modified-time/38596
This commit is contained in:
Nick Craig-Wood 2023-06-07 09:19:16 +01:00
parent 31773ecfbf
commit 279d9ecc56
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
fs/operations/operations.go
View file

@ -254,11 +254,11 @@ func equal(ctx context.Context, src fs.ObjectInfo, dst fs.Object, opt equalOpt)
} }
// Update the mtime of the dst object here // Update the mtime of the dst object here
err := dst.SetModTime(ctx, srcModTime) err := dst.SetModTime(ctx, srcModTime)
if err == fs.ErrorCantSetModTime { if errors.Is(err, fs.ErrorCantSetModTime) {
logModTimeUpload(dst) logModTimeUpload(dst)
fs.Infof(dst, "src and dst identical but can't set mod time without re-uploading") fs.Infof(dst, "src and dst identical but can't set mod time without re-uploading")
return false return false
} else if err == fs.ErrorCantSetModTimeWithoutDelete { } else if errors.Is(err, fs.ErrorCantSetModTimeWithoutDelete) {
logModTimeUpload(dst) logModTimeUpload(dst)
fs.Infof(dst, "src and dst identical but can't set mod time without deleting and re-uploading") fs.Infof(dst, "src and dst identical but can't set mod time without deleting and re-uploading")
// Remove the file if BackupDir isn't set. If BackupDir is set we would rather have the old file // Remove the file if BackupDir isn't set. If BackupDir is set we would rather have the old file
@ -388,14 +388,14 @@ func Copy(ctx context.Context, f fs.Fs, dst fs.Object, remote string, src fs.Obj
} else { } else {
_ = in.Close() _ = in.Close()
} }
if err == fs.ErrorCantCopy { if errors.Is(err, fs.ErrorCantCopy) {
tr.Reset(ctx) // skip incomplete accounting - will be overwritten by the manual copy below tr.Reset(ctx) // skip incomplete accounting - will be overwritten by the manual copy below
} }
} else { } else {
err = fs.ErrorCantCopy err = fs.ErrorCantCopy
} }
// If can't server-side copy, do it manually // If can't server-side copy, do it manually
if err == fs.ErrorCantCopy { if errors.Is(err, fs.ErrorCantCopy) {
if doMultiThreadCopy(ctx, f, src) { if doMultiThreadCopy(ctx, f, src) {
// Number of streams proportional to size // Number of streams proportional to size
streams := src.Size() / int64(ci.MultiThreadCutoff) streams := src.Size() / int64(ci.MultiThreadCutoff)
@ -1211,7 +1211,7 @@ func Purge(ctx context.Context, f fs.Fs, dir string) (err error) {
return nil return nil
} }
err = doPurge(ctx, dir) err = doPurge(ctx, dir)
if err == fs.ErrorCantPurge { if errors.Is(err, fs.ErrorCantPurge) {
doFallbackPurge = true doFallbackPurge = true
} }
} }
@ -1922,7 +1922,7 @@ func moveOrCopyFile(ctx context.Context, fdst fs.Fs, fsrc fs.Fs, dstFileName str
var dstObj fs.Object var dstObj fs.Object
if !ci.NoCheckDest { if !ci.NoCheckDest {
dstObj, err = fdst.NewObject(ctx, dstFileName) dstObj, err = fdst.NewObject(ctx, dstFileName)
if err == fs.ErrorObjectNotFound { if errors.Is(err, fs.ErrorObjectNotFound) {
dstObj = nil dstObj = nil
} else if err != nil { } else if err != nil {
return err return err