summaryrefslogtreecommitdiff
path: root/libpod/runtime.go
diff options
context:
space:
mode:
authorValentin Rothberg <rothberg@redhat.com>2020-01-08 13:57:54 +0100
committerValentin Rothberg <rothberg@redhat.com>2020-01-08 15:44:21 +0100
commit0b53ff290232f2854a5df09be91fed46d670f47e (patch)
treef01e8bba822588e6238c25cccb2a7feeb79c3ab0 /libpod/runtime.go
parentbaba52c6b585e6ca8c618c41072fcbb241a0b419 (diff)
downloadpodman-0b53ff290232f2854a5df09be91fed46d670f47e.tar.gz
podman-0b53ff290232f2854a5df09be91fed46d670f47e.tar.bz2
podman-0b53ff290232f2854a5df09be91fed46d670f47e.zip
fix lint - drop else block
Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
Diffstat (limited to 'libpod/runtime.go')
-rw-r--r--libpod/runtime.go6
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 {