p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #29346 from xlgao-zju/just-return-assignment

Browse Source 
Get rid of err altogether by just returning the assignment
Upstream-commit: 96ac223a1373848b1e5532af6a9887a2ede17de8
Component: engine
This commit is contained in:
Vincent Demeester
2016-12-13 15:19:45 +01:00
committed by GitHub
parent caf5d45bd8 d0d8fac761
commit f5a62125bb
2 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/engine/pkg/aaparser/aaparser.go
View File

@ -39,7 +39,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

11
components/engine/profiles/apparmor/apparmor.go
View File

@ -54,10 +54,7 @@ func (p *profileData) generateDefault(out io.Writer) error {
}
p.Version = ver
if err := compiled.Execute(out, p); err != nil {
return err
}
return nil
return compiled.Execute(out, p)
}
// macrosExists checks if the passed macro exists.
@ -87,11 +84,7 @@ func InstallDefault(name string) error {
return err
}
if err := aaparser.LoadProfile(profilePath); err != nil {
return err
}
return nil
return aaparser.LoadProfile(profilePath)
}
// IsLoaded checks if a profile with the given name has been loaded into the