diff --git a/contrib/apparmor/template.go b/contrib/apparmor/template.go index df3f72e78bf8..ba613c3e7db6 100644 --- a/contrib/apparmor/template.go +++ b/contrib/apparmor/template.go @@ -151,7 +151,7 @@ func generate(p *data, o io.Writer) error { func load(path string) error { out, err := aaParser("-Kr", path) if err != nil { - return fmt.Errorf("%s: %s", err, out) + return fmt.Errorf("parser error(%q): %w", strings.TrimSpace(out), err) } return nil } @@ -164,10 +164,7 @@ func macroExists(m string) bool { func aaParser(args ...string) (string, error) { out, err := exec.Command("apparmor_parser", args...).CombinedOutput() - if err != nil { - return "", err - } - return string(out), nil + return string(out), err } func getVersion() (int, error) {