diff --git a/backend/jottacloud/jottacloud.go b/backend/jottacloud/jottacloud.go index 2f80b336c..7358d3174 100644 --- a/backend/jottacloud/jottacloud.go +++ b/backend/jottacloud/jottacloud.go @@ -1087,8 +1087,7 @@ func (f *Fs) copyOrMove(ctx context.Context, method, src, dest string) (info *ap var resp *http.Response err = f.pacer.Call(func() (bool, error) { resp, err = f.srv.CallXML(ctx, &opts, nil, &info) - retry, _ := shouldRetry(resp, err) - return (retry && resp.StatusCode != 500), err + return shouldRetry(resp, err) }) if err != nil { return nil, err @@ -1192,18 +1191,6 @@ func (f *Fs) DirMove(ctx context.Context, src fs.Fs, srcRemote, dstRemote string _, err = f.copyOrMove(ctx, "mvDir", path.Join(f.endpointURL, f.opt.Enc.FromStandardPath(srcPath))+"/", dstRemote) - // surprise! jottacloud fucked up dirmove - the api spits out an error but - // dir gets moved regardless - if apiErr, ok := err.(*api.Error); ok { - if apiErr.StatusCode == 500 { - _, err := f.NewObject(ctx, dstRemote) - if err == fs.ErrorNotAFile { - log.Printf("FIXME: ignoring DirMove error - move succeeded anyway\n") - return nil - } - return err - } - } if err != nil { return errors.Wrap(err, "couldn't move directory") }