From 908b23fda007a266e48366a642b9aec9b7fdff5f Mon Sep 17 00:00:00 2001 From: Michael Eischer Date: Sat, 22 Aug 2020 12:14:42 +0200 Subject: [PATCH] copy: Update for modernized repository interface --- cmd/restic/cmd_copy.go | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/cmd/restic/cmd_copy.go b/cmd/restic/cmd_copy.go index 10424c938..cbc29a1b3 100644 --- a/cmd/restic/cmd_copy.go +++ b/cmd/restic/cmd_copy.go @@ -168,27 +168,15 @@ func copyTree(ctx context.Context, srcRepo, dstRepo restic.Repository, treeID re continue } debug.Log("Copying blob %s\n", blobID.Str()) - size, found := srcRepo.LookupBlobSize(blobID, restic.DataBlob) - if !found { - return fmt.Errorf("LookupBlobSize(%v) failed", blobID) - } - buf := restic.NewBlobBuffer(int(size)) - n, err := srcRepo.LoadBlob(ctx, restic.DataBlob, blobID, buf) + buf, err := srcRepo.LoadBlob(ctx, restic.DataBlob, blobID, nil) if err != nil { return fmt.Errorf("LoadBlob(%v) returned error %v", blobID, err) } - if n != len(buf) { - return fmt.Errorf("wrong number of bytes read, want %d, got %d", len(buf), n) - } - newBlobID, err := dstRepo.SaveBlob(ctx, restic.DataBlob, buf, blobID) + _, _, err = dstRepo.SaveBlob(ctx, restic.DataBlob, buf, blobID, false) if err != nil { return fmt.Errorf("SaveBlob(%v) returned error %v", blobID, err) } - // Assurance only. - if newBlobID != blobID { - return fmt.Errorf("SaveBlob(%v) returned unexpected id %s", blobID.Str(), newBlobID.Str()) - } } }