Merge pull request moby#4117 from crazy-max/fix-filesync

tonistiigi · web-flow · commit 397f69e5372d · 2023-08-08T10:57:14.000+03:00
filesync: write closer err discarded
diff --git a/session/filesync/filesync.go b/session/filesync/filesync.go
@@ -277,7 +277,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
`@@ -277,7 +277,7 @@ func (sp *fsSyncTarget) DiffCopy(stream FileSend_DiffCopyServer) (err error) {`
`277`	`277`	`}`
`278`	`278`	`defer func() {`
`279`	`279`	`err1 := wc.Close()`
`280`		`- if err != nil {`
	`280`	`+ if err == nil {`
`281`	`281`	`err = err1`
`282`	`282`	`}`
`283`	`283`	`}()`