From a8c9c4bf976915966b0e0038f32fe5cb85a9468c Mon Sep 17 00:00:00 2001 From: Michael Crosby Date: Sun, 13 Apr 2014 23:37:12 +0000 Subject: [PATCH] Ignore is not exist error Docker-DCO-1.1-Signed-off-by: Michael Crosby (github: crosbymichael) --- apparmor/setup.go | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/apparmor/setup.go b/apparmor/setup.go index e32e815..3494762 100644 --- a/apparmor/setup.go +++ b/apparmor/setup.go @@ -99,11 +99,15 @@ func InstallDefaultProfile(backupPath string) error { return err } - // the current functionality of the load script is the exit 0 if the parser does not exist. - // we think we should fail loudly if you have apparmor enabled but not the parser to load - // the profile for use. output, err := exec.Command("/sbin/apparmor_parser", "-r", "-W", "docker").CombinedOutput() - if err != nil { + if err != nil && !os.IsNotExist(err) { + if e, ok := err.(*exec.Error); ok { + // keeping with the current profile load code, if the parser does not exist then + // just return + if e.Err == exec.ErrNotFound || os.IsNotExist(e.Err) { + return nil + } + } return fmt.Errorf("Error loading docker profile: %s (%s)", err, output) } return nil