Merge lp:~mvo/snappy/snappy-more-errors-15.04 into lp:~snappy-dev/snappy/15.04-deprecated

[Michael Vogt]

Improve error reporting for failed hooks.

Improve error reporting for failed hooks.

[John Lenton (chipaca)]

Thanks!

review: Approve

=== modified file 'snappy/click.go'
--- snappy/click.go	2015-05-01 12:32:20 +0000
+++ snappy/click.go	2015-05-26 09:23:14 +0000
@@ -99,9 +99,10 @@
 func execHook(execCmd string) (err error) {
 	// the spec says this is passed to the shell
 	cmd := exec.Command("sh", "-c", execCmd)
-	if err = cmd.Run(); err != nil {
+	if output, err := cmd.CombinedOutput(); err != nil {
 		if exitCode, err := helpers.ExitCode(err); err == nil {
 			return &ErrHookFailed{cmd: execCmd,
+				output:   string(output),
 				exitCode: exitCode}
 		}
 		return err

=== modified file 'snappy/errors.go'
--- snappy/errors.go	2015-05-01 12:32:42 +0000
+++ snappy/errors.go	2015-05-26 09:23:14 +0000
@@ -178,11 +178,12 @@
 // ErrHookFailed is returned if a hook command fails
 type ErrHookFailed struct {
 	cmd      string
+	output   string
 	exitCode int
 }
 
 func (e *ErrHookFailed) Error() string {
-	return fmt.Sprintf("hook command %v failed with exit status %d", e.cmd, e.exitCode)
+	return fmt.Sprintf("hook command %v failed with exit status %d (output: '%s')", e.cmd, e.exitCode, e.output)
 }
 
 // ErrDataCopyFailed is returned if copying the snap data fialed