Merge pull request #5485 from schomatis/fix/commands/files-cp-wrap-flush-error

Stebalien · web-flow · commit 23b44ba3c758 · 2018-09-19T18:39:19.000Z
files cp: wrap flush error
diff --git a/core/commands/files.go b/core/commands/files.go
@@ -344,7 +344,7 @@ var filesCpCmd = &oldcmds.Command{
 		if flush {
 			err := mfs.FlushPath(node.FilesRoot, dst)
 			if err != nil {
-				res.SetError(err, cmdkit.ErrNormal)
+				res.SetError(fmt.Errorf("cp: cannot flush the created file %s: %s", dst, err), cmdkit.ErrNormal)
 				return
 			}
 		}

Original file line number	Diff line number	Diff line change
`@@ -344,7 +344,7 @@ var filesCpCmd = &oldcmds.Command{`
`344`	`344`	`if flush {`
`345`	`345`	`err := mfs.FlushPath(node.FilesRoot, dst)`
`346`	`346`	`if err != nil {`
`347`		`- res.SetError(err, cmdkit.ErrNormal)`
	`347`	`+ res.SetError(fmt.Errorf("cp: cannot flush the created file %s: %s", dst, err), cmdkit.ErrNormal)`
`348`	`348`	`return`
`349`	`349`	`}`
`350`	`350`	`}`