Merge pull request moby#4119 from crazy-max/v0.12_backport_fix-filesync

crazy-max · web-flow · commit 2a6aaceda350 · 2023-08-08T10:27:58.000+02:00
[0.12 backport] filesync: write closer err discarded
diff --git a/session/filesync/filesync.go b/session/filesync/filesync.go
@@ -286,7 +286,7 @@ func (sp *fsSyncTarget) DiffCopy(stream FileSend_DiffCopyServer) (err error) {
 	}
 	defer func() {
 		err1 := wc.Close()
-		if err != nil {
+		if err == nil {
 			err = err1
 		}
 	}()

Original file line number	Diff line number	Diff line change
`@@ -286,7 +286,7 @@ func (sp *fsSyncTarget) DiffCopy(stream FileSend_DiffCopyServer) (err error) {`
`286`	`286`	`}`
`287`	`287`	`defer func() {`
`288`	`288`	`err1 := wc.Close()`
`289`		`- if err != nil {`
	`289`	`+ if err == nil {`
`290`	`290`	`err = err1`
`291`	`291`	`}`
`292`	`292`	`}()`