1
0
mirror of https://github.com/rancher/os.git synced 2025-09-16 15:09:27 +00:00

Fix golint check error

https://github.com/rancher/os/issues/2166
This commit is contained in:
niusmallnan
2017-12-06 13:45:49 +08:00
parent d8bba34a87
commit 7b474cd905
8 changed files with 13 additions and 62 deletions

View File

@@ -215,11 +215,7 @@ func execDocker(config *Config, docker, cmd string, args []string) (*exec.Cmd, e
func copyDefault(folder, name string) error {
defaultFile := path.Join(defaultPrefix, folder, name)
if err := CopyFile(defaultFile, folder, name); err != nil {
return err
}
return nil
return CopyFile(defaultFile, folder, name)
}
func copyDefaultFolder(folder string) error {
@@ -459,11 +455,7 @@ func PrepareFs(config *Config) error {
return err
}
if err := firstPrepare(); err != nil {
return err
}
return nil
return firstPrepare()
}
func touchSocket(path string) error {
@@ -587,11 +579,7 @@ func firstPrepare() error {
return err
}
if err := createGroup(); err != nil {
return err
}
return nil
return createGroup()
}
func secondPrepare(config *Config, docker string, args ...string) error {