Don't lose Compare failure if aborting diff upload fails

TBBle · TBBle · commit b399e2ef6d63 · 2021-04-10T02:02:33.000+10:00
Signed-off-by: Paul "TBBle" Hampson &lt;Paul.Hampson@Pobox.com&gt;
diff --git a/diff/walking/differ.go b/diff/walking/differ.go
@@ -99,8 +99,8 @@ func (s *walkingDiff) Compare(ctx context.Context, lower, upper []mount.Mount, o
 				if err != nil {
 					cw.Close()
 					if newReference {
-						if err := s.store.Abort(ctx, config.Reference); err != nil {
-							log.G(ctx).WithField("ref", config.Reference).Warnf("failed to delete diff upload")
+						if abortErr := s.store.Abort(ctx, config.Reference); abortErr != nil {
+							log.G(ctx).WithError(abortErr).WithField("ref", config.Reference).Warnf("failed to delete diff upload")
 						}
 					}
 				}

Original file line number	Diff line number	Diff line change
`@@ -99,8 +99,8 @@ func (s *walkingDiff) Compare(ctx context.Context, lower, upper []mount.Mount, o`
`99`	`99`	`if err != nil {`
`100`	`100`	`cw.Close()`
`101`	`101`	`if newReference {`
`102`		`- if err := s.store.Abort(ctx, config.Reference); err != nil {`
`103`		`- log.G(ctx).WithField("ref", config.Reference).Warnf("failed to delete diff upload")`
	`102`	`+ if abortErr := s.store.Abort(ctx, config.Reference); abortErr != nil {`
	`103`	`+ log.G(ctx).WithError(abortErr).WithField("ref", config.Reference).Warnf("failed to delete diff upload")`
`104`	`104`	`}`
`105`	`105`	`}`
`106`	`106`	`}`