GitList

Browse code

Make vfs error more explicit

Docker-DCO-1.0-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com> (github: creack)

Guillaume J. Charmes authored on 2014/01/08 09:02:41
Showing 1 changed files

graphdriver/vfs/driver.go index fab9d06..12230f4 100644

@@ -36,9 +36,8 @@ func (d *Driver) Cleanup() error {
 }
 
 func copyDir(src, dst string) error {
-	cmd := exec.Command("cp", "-aT", "--reflink=auto", src, dst)
-	if err := cmd.Run(); err != nil {
-		return err
+	if output, err := exec.Command("cp", "-aT", "--reflink=auto", src, dst).CombinedOutput(); err != nil {
+		return fmt.Errorf("Error VFS copying directory: %s (%s)", err, output)
 	}
 	return nil
 }

...	...	@@ -36,9 +36,8 @@ func (d *Driver) Cleanup() error {
36	36	}
37	37
38	38	func copyDir(src, dst string) error {
39		- cmd := exec.Command("cp", "-aT", "--reflink=auto", src, dst)
40		- if err := cmd.Run(); err != nil {
41		- return err
	39	+ if output, err := exec.Command("cp", "-aT", "--reflink=auto", src, dst).CombinedOutput(); err != nil {
	40	+ return fmt.Errorf("Error VFS copying directory: %s (%s)", err, output)
42	41	}
43	42	return nil
44	43	}