diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-01-08 16:58:50 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-08 16:58:50 +0100 |
| commit | c6ad42a176c943aa96a8c053682196cd38fd6a1a (patch) | |
| tree | ef71ccbda94462f1bee19e8153c361751813df8a /libpod/runtime.go | |
| parent | 27caffbb240725255485deaaecd548663adbf1fd (diff) | |
| parent | bcf5753276fcb7280924b46c7c49ef3e2388c9b0 (diff) | |
| download | podman-c6ad42a176c943aa96a8c053682196cd38fd6a1a.tar.gz podman-c6ad42a176c943aa96a8c053682196cd38fd6a1a.tar.bz2 podman-c6ad42a176c943aa96a8c053682196cd38fd6a1a.zip | |
Merge pull request #4816 from vrothberg/lint
Fix golint errors
Diffstat (limited to 'libpod/runtime.go')
| -rw-r--r-- | libpod/runtime.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libpod/runtime.go b/libpod/runtime.go index 001d850b0..b4cbde28e 100644 --- a/libpod/runtime.go +++ b/libpod/runtime.go @@ -213,11 +213,11 @@ func getLockManager(runtime *Runtime) (lock.Manager, error) { // Sets up containers/storage, state store, OCI runtime func makeRuntime(ctx context.Context, runtime *Runtime) (err error) { // Find a working conmon binary - if cPath, err := runtime.config.FindConmon(); err != nil { + cPath, err := runtime.config.FindConmon() + if err != nil { return err - } else { - runtime.conmonPath = cPath } + runtime.conmonPath = cPath // Make the static files directory if it does not exist if err := os.MkdirAll(runtime.config.StaticDir, 0700); err != nil { |