Merge pull request #5567 from estesp/cp-5560-1.5

fuweid · web-flow · commit 9a573903b176 · 2021-06-04T14:10:45.000+08:00
[release/1.5] cherry-pick: Change Wrapf of non-error to an actual error
diff --git a/content/local/store.go b/content/local/store.go
@@ -500,7 +500,7 @@ func (s *store) resumeStatus(ref string, total int64, digester digest.Digester)
 	if ref != status.Ref {
 		// NOTE(stevvooe): This is fairly catastrophic. Either we have some
 		// layout corruption or a hash collision for the ref key.
-		return status, errors.Wrapf(err, "ref key does not match: %v != %v", ref, status.Ref)
+		return status, errors.Errorf("ref key does not match: %v != %v", ref, status.Ref)
 	}
 
 	if total > 0 && status.Total > 0 && total != status.Total {

Original file line number	Diff line number	Diff line change
`@@ -500,7 +500,7 @@ func (s *store) resumeStatus(ref string, total int64, digester digest.Digester)`
`500`	`500`	`if ref != status.Ref {`
`501`	`501`	`// NOTE(stevvooe): This is fairly catastrophic. Either we have some`
`502`	`502`	`// layout corruption or a hash collision for the ref key.`
`503`		`- return status, errors.Wrapf(err, "ref key does not match: %v != %v", ref, status.Ref)`
	`503`	`+ return status, errors.Errorf("ref key does not match: %v != %v", ref, status.Ref)`
`504`	`504`	`}`
`505`	`505`
`506`	`506`	`if total > 0 && status.Total > 0 && total != status.Total {`