TrueCloudLab/rclone
16
0
Fork 2
Code Issues 1 Pull requests 1 Projects Releases Packages Wiki Activity Actions

Ignore return from patch request on failure.

Browse source
This commit is contained in:
Josiah White 2017-08-31 18:48:24 +02:00 committed by Nick Craig-Wood
parent 09fbbdbb04
commit 445fc55772
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drive/drive.go
View file

@ -749,9 +749,9 @@ func (f *Fs) MergeDirs(dirs []fs.Directory) error {
for _, info := range infos { for _, info := range infos {
fs.Infof(srcDir, "merging %q", info.Title) fs.Infof(srcDir, "merging %q", info.Title)
// Move the file into the destination // Move the file into the destination
info.Parents = []*drive.ParentReference{{Id: dstDir.ID()}}
err = f.pacer.Call(func() (bool, error) { err = f.pacer.Call(func() (bool, error) {
info.Parents = []*drive.ParentReference{{Id: dstDir.ID()}} _, err = f.svc.Files.Patch(info.Id, info).SetModifiedDate(true).Fields(googleapi.Field(partialFields)).SupportsTeamDrives(f.isTeamDrive).Do()
info, err = f.svc.Files.Patch(info.Id, info).SetModifiedDate(true).Fields(googleapi.Field(partialFields)).SupportsTeamDrives(f.isTeamDrive).Do()
return shouldRetry(err) return shouldRetry(err)
}) })
if err != nil { if err != nil {