← Back to branch summary

~mvo/snappy/snappy-os-snap-support

« back to all changes in this revision

Viewing changes to snappy/hwaccess.go

  • Committer: Snappy Tarmac
  • Author(s): Michael Vogt
  • Date: 2015-05-01 15:21:52 UTC
  • mfrom: (434.1.2 snappy-fix-exit1)
  • Revision ID: snappy_tarmac-20150501152152-2ssql7e3a98ee9np
Fix error reporting of aaClickHookCmd, execHook, copySnapDirectory. by mvo approved by sergiusens

Show diffs side-by-side

added added

removed removed

Lines of Context:
snappy/hwaccess.go
87
87
}
88
88
 
89
89
func regenerateAppArmorRulesImpl() error {
90
 
        if err := exec.Command(aaClickHookCmd, "-f").Run(); err != nil {
91
 
                if exitCode, err := helpers.ExitCode(err); err != nil {
92
 
                        return &ErrHookFailed{
93
 
                                cmd:      aaClickHookCmd,
 
90
        if output, err := exec.Command(aaClickHookCmd, "-f").CombinedOutput(); err != nil {
 
91
                if exitCode, err := helpers.ExitCode(err); err == nil {
 
92
                        return &ErrApparmorGenerate{
94
93
                                exitCode: exitCode,
 
94
                                output:   output,
95
95
                        }
96
96
                }
97
97
                return err