vbatts/cri-o
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

add apparmor build tag and update readme

Browse source 
Signed-off-by: Xianglin Gao <xlgao@zju.edu.cn>
This commit is contained in:
Xianglin Gao 2016-12-02 15:13:41 +08:00
parent bec3c3e2aa
commit 4f323377ee
10 changed files with 235 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

4
server/apparmor/aaparser.go
View file

@ -1,3 +1,5 @@
// +build apparmor
package apparmor
import (
@ -35,7 +37,7 @@ func cmd(dir string, arg ...string) (string, error) {
output, err := c.CombinedOutput()
if err != nil {
return "", fmt.Errorf("running `%s %s` failed with output: %s\nerror: %v", c.Path, strings.Join(c.Args, " "), string(output), err)
return "", fmt.Errorf("running `%s %s` failed with output: %s\nerror: %v", c.Path, strings.Join(c.Args, " "), output, err)
}
return string(output), nil