github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #6415 from dmcgowan/contrib-apparmor-cleanup

Browse Source 
Update error message for apparmor parser
This commit is contained in:
Akihiro Suda 2022-01-10 16:40:57 +09:00 committed by GitHub
commit 35b96f9b1c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
contrib/apparmor/template.go
View File

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