Merge pull request #5218 from schomatis/fix/cmds-files-cp/err-msg

whyrusleeping · web-flow · commit 256ad2709905 · 2018-07-18T12:19:06.000-05:00
commands/files: add error messages for `cp` paths
diff --git a/core/commands/files.go b/core/commands/files.go
@@ -329,13 +329,13 @@ var filesCpCmd = &oldcmds.Command{
 
 		nd, err := getNodeFromPath(req.Context(), node, node.DAG, src)
 		if err != nil {
-			res.SetError(err, cmdkit.ErrNormal)
+			res.SetError(fmt.Errorf("cp: cannot get node from path %s: %s", src, err), cmdkit.ErrNormal)
 			return
 		}
 
 		err = mfs.PutNode(node.FilesRoot, dst, nd)
 		if err != nil {
-			res.SetError(err, cmdkit.ErrNormal)
+			res.SetError(fmt.Errorf("cp: cannot put node in path %s: %s", dst, err), cmdkit.ErrNormal)
 			return
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -329,13 +329,13 @@ var filesCpCmd = &oldcmds.Command{`
`329`	`329`
`330`	`330`	`nd, err := getNodeFromPath(req.Context(), node, node.DAG, src)`
`331`	`331`	`if err != nil {`
`332`		`- res.SetError(err, cmdkit.ErrNormal)`
	`332`	`+ res.SetError(fmt.Errorf("cp: cannot get node from path %s: %s", src, err), cmdkit.ErrNormal)`
`333`	`333`	`return`
`334`	`334`	`}`
`335`	`335`
`336`	`336`	`err = mfs.PutNode(node.FilesRoot, dst, nd)`
`337`	`337`	`if err != nil {`
`338`		`- res.SetError(err, cmdkit.ErrNormal)`
	`338`	`+ res.SetError(fmt.Errorf("cp: cannot put node in path %s: %s", dst, err), cmdkit.ErrNormal)`
`339`	`339`	`return`
`340`	`340`	`}`
`341`	`341`