fs: fix wrapping nil err

AkihiroSuda · AkihiroSuda · commit def67296172f · 2022-03-25T17:06:13.000+09:00
Signed-off-by: Akihiro Suda &lt;akihiro.suda.cz@hco.ntt.co.jp&gt;
diff --git a/fs/copy.go b/fs/copy.go
@@ -158,7 +158,9 @@ func copyDirectory(dst, src string, inodes map[uint64]string, o *copyDirOpts) er
 			}
 		default:
 			// TODO: Support pipes and sockets
-			return fmt.Errorf("unsupported mode %s: %w", fi.Mode(), err)
+			if err != nil {
+				return fmt.Errorf("unsupported mode %s: %w", fi.Mode(), err)
+			}
 		}
 
 		if err := copyFileInfo(fi, source, target); err != nil {

Original file line number	Diff line number	Diff line change
`@@ -158,7 +158,9 @@ func copyDirectory(dst, src string, inodes map[uint64]string, o *copyDirOpts) er`
`158`	`158`	`}`
`159`	`159`	`default:`
`160`	`160`	`// TODO: Support pipes and sockets`
`161`		`- return fmt.Errorf("unsupported mode %s: %w", fi.Mode(), err)`
	`161`	`+ if err != nil {`
	`162`	`+ return fmt.Errorf("unsupported mode %s: %w", fi.Mode(), err)`
	`163`	`+ }`
`162`	`164`	`}`
`163`	`165`
`164`	`166`	`if err := copyFileInfo(fi, source, target); err != nil {`