From 445fc55772be21e70d6a0170a1b1420c2449cb77 Mon Sep 17 00:00:00 2001 From: Josiah White Date: Thu, 31 Aug 2017 18:48:24 +0200 Subject: [PATCH] Ignore return from patch request on failure. --- drive/drive.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drive/drive.go b/drive/drive.go index f0339e241..8841920ca 100644 --- a/drive/drive.go +++ b/drive/drive.go @@ -749,9 +749,9 @@ func (f *Fs) MergeDirs(dirs []fs.Directory) error { for _, info := range infos { fs.Infof(srcDir, "merging %q", info.Title) // Move the file into the destination + info.Parents = []*drive.ParentReference{{Id: dstDir.ID()}} err = f.pacer.Call(func() (bool, error) { - info.Parents = []*drive.ParentReference{{Id: dstDir.ID()}} - info, err = f.svc.Files.Patch(info.Id, info).SetModifiedDate(true).Fields(googleapi.Field(partialFields)).SupportsTeamDrives(f.isTeamDrive).Do() + _, err = f.svc.Files.Patch(info.Id, info).SetModifiedDate(true).Fields(googleapi.Field(partialFields)).SupportsTeamDrives(f.isTeamDrive).Do() return shouldRetry(err) }) if err != nil {