summaryrefslogtreecommitdiff
path: root/libpod/config/default.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/config/default.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/config/default.go')
-rw-r--r--libpod/config/default.go7
1 files changed, 4 insertions, 3 deletions
diff --git a/libpod/config/default.go b/libpod/config/default.go
index 5decaeab7..c4a4efdaf 100644
--- a/libpod/config/default.go
+++ b/libpod/config/default.go
@@ -26,11 +26,12 @@ const (
// config is different for root and rootless. It also parses the storage.conf.
func defaultConfigFromMemory() (*Config, error) {
c := new(Config)
- if tmp, err := defaultTmpDir(); err != nil {
+ tmp, err := defaultTmpDir()
+ if err != nil {
return nil, err
- } else {
- c.TmpDir = tmp
}
+ c.TmpDir = tmp
+
c.EventsLogFilePath = filepath.Join(c.TmpDir, "events", "events.log")
storeOpts, err := storage.DefaultStoreOptions(rootless.IsRootless(), rootless.GetRootlessUID())