From 8031794511bec2342b9ba389ef25c2e38ffd6cf3 Mon Sep 17 00:00:00 2001
From: William Douglas <william.douglas@intel.com>
Date: Fri, 26 Jan 2024 11:27:28 -0800
Subject: [PATCH] Fix remaining two logic lints

Signed-off-by: William Douglas <william.douglas@intel.com>
---
 builder/builder.go        | 15 +++++++--------
 swupd/create_manifests.go | 23 +++++++++++------------
 2 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/builder/builder.go b/builder/builder.go
index 0eb1be8..aedaa60 100644
--- a/builder/builder.go
+++ b/builder/builder.go
@@ -450,16 +450,15 @@ func (b *Builder) BuildImage(format string, configFile string) error {
 
 		// If the legacy JSON file exists, rename the old file to prevent migration
 		// each time we build and discourage the user from using the old JSON file.
-		if _, err := os.Stat(migrationFile); os.IsNotExist(err) {
-		} else if err != nil {
+		if _, err := os.Stat(migrationFile); err != nil && !os.IsNotExist(err) {
 			return err
-		} else {
-			renameFile := migrationFile + "-EOL"
-			log.Info(log.Mixer, " Renaming previous generation config %s to %s", migrationFile, renameFile)
-			if mvErr := os.Rename(migrationFile, renameFile); mvErr != nil {
-				log.Warning(log.Mixer, "Failed to rename %s: %v", migrationFile, mvErr)
-			}
 		}
+		renameFile := migrationFile + "-EOL"
+		log.Info(log.Mixer, " Renaming previous generation config %s to %s", migrationFile, renameFile)
+		if mvErr := os.Rename(migrationFile, renameFile); mvErr != nil {
+			log.Warning(log.Mixer, "Failed to rename %s: %v", migrationFile, mvErr)
+		}
+
 	} else {
 		if !strings.HasSuffix(configFile, "yaml") {
 			return fmt.Errorf("build configuration file '%s' must end in .yaml", configFile)
diff --git a/swupd/create_manifests.go b/swupd/create_manifests.go
index 98af32d..cfa7d20 100644
--- a/swupd/create_manifests.go
+++ b/swupd/create_manifests.go
@@ -93,24 +93,23 @@ func initBundles(ui UpdateInfo, c config, numWorkers int) ([]*Manifest, error) {
 				tmpManifests = append(tmpManifests, bundle)
 				mux.Unlock()
 				continue
-			} else {
-				log.Info(log.Mixer, "- %s", bundleName)
-				biPath := filepath.Join(c.imageBase, fmt.Sprint(ui.version), bundle.Name+"-info")
-				if _, err = os.Stat(biPath); os.IsNotExist(err) {
-					err = syncToFull(ui.version, bundle.Name, c.imageBase)
-					if err != nil {
-						errorChan <- err
-						return
-					}
-				}
-
-				err = bundle.GetBundleInfo(c.stateDir, biPath)
+			}
+			log.Info(log.Mixer, "- %s", bundleName)
+			biPath := filepath.Join(c.imageBase, fmt.Sprint(ui.version), bundle.Name+"-info")
+			if _, err = os.Stat(biPath); os.IsNotExist(err) {
+				err = syncToFull(ui.version, bundle.Name, c.imageBase)
 				if err != nil {
 					errorChan <- err
 					return
 				}
 			}
 
+			err = bundle.GetBundleInfo(c.stateDir, biPath)
+			if err != nil {
+				errorChan <- err
+				return
+			}
+
 			mux.Lock()
 			tmpManifests = append(tmpManifests, bundle)
 			mux.Unlock()