fix lint - drop else block

Signed-off-by: Valentin Rothberg <rothberg@redhat.com>

2 files changed, 35 insertions, 32 deletions

diff --git a/libpod/config/config.go b/libpod/config/config.go
index c99a1c947..13c128688 100644
--- a/libpod/config/config.go
+++ b/libpod/config/config.go
@@ -451,45 +451,47 @@ func NewConfig(userConfigPath string) (*Config, error) {
 	}
 
 	// Now, check if the user can access system configs and merge them if needed.
-	if configs, err := systemConfigs(); err != nil {
+	configs, err := systemConfigs()
+	if err != nil {
 		return nil, errors.Wrapf(err, "error finding config on system")
-	} else {
-		migrated := false
-		for _, path := range configs {
-			systemConfig, err := readConfigFromFile(path)
-			if err != nil {
-				return nil, errors.Wrapf(err, "error reading system config %q", path)
-			}
-			// Handle CGroups v2 configuration migration.
-			// Migrate only the first config, and do it before
-			// merging.
-			if !migrated {
-				if err := cgroupV2Check(path, systemConfig); err != nil {
-					return nil, errors.Wrapf(err, "error rewriting configuration file %s", userConfigPath)
-				}
-				migrated = true
-			}
-			// Merge the it into the config. Any unset field in config will be
-			// over-written by the systemConfig.
-			if err := config.mergeConfig(systemConfig); err != nil {
-				return nil, errors.Wrapf(err, "error merging system config")
+	}
+
+	migrated := false
+	for _, path := range configs {
+		systemConfig, err := readConfigFromFile(path)
+		if err != nil {
+			return nil, errors.Wrapf(err, "error reading system config %q", path)
+		}
+		// Handle CGroups v2 configuration migration.
+		// Migrate only the first config, and do it before
+		// merging.
+		if !migrated {
+			if err := cgroupV2Check(path, systemConfig); err != nil {
+				return nil, errors.Wrapf(err, "error rewriting configuration file %s", userConfigPath)
 			}
-			logrus.Debugf("Merged system config %q: %v", path, config)
+			migrated = true
+		}
+		// Merge the it into the config. Any unset field in config will be
+		// over-written by the systemConfig.
+		if err := config.mergeConfig(systemConfig); err != nil {
+			return nil, errors.Wrapf(err, "error merging system config")
 		}
+		logrus.Debugf("Merged system config %q: %v", path, config)
 	}
 
 	// Finally, create a default config from memory and forcefully merge it into
 	// the config. This way we try to make sure that all fields are properly set
 	// and that user AND system config can partially set.
-	if defaultConfig, err := defaultConfigFromMemory(); err != nil {
+	defaultConfig, err := defaultConfigFromMemory()
+	if err != nil {
 		return nil, errors.Wrapf(err, "error generating default config from memory")
-	} else {
-		// Check if we need to switch to cgroupfs and logger=file on rootless.
-		defaultConfig.checkCgroupsAndLogger()
+	}
 
-		if err := config.mergeConfig(defaultConfig); err != nil {
-			return nil, errors.Wrapf(err, "error merging default config from memory")
-		}
+	// Check if we need to switch to cgroupfs and logger=file on rootless.
+	defaultConfig.checkCgroupsAndLogger()
+
+	if err := config.mergeConfig(defaultConfig); err != nil {
+		return nil, errors.Wrapf(err, "error merging default config from memory")
 	}
 
 	// Relative paths can cause nasty bugs, because core paths we use could
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())