Fix linter errors

Signed-off-by: Tudor Marcu <tudor.marcu@intel.com>
clearlinux · Jun 29, 2018 · e8e8116 · e8e8116
1 parent c5a0129
commit e8e8116
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/builder/builder.go b/builder/builder.go
@@ -1616,7 +1616,8 @@ func (b *Builder) buildUpdateContent(params UpdateParameters, timer *stopWatch)
 		fmt.Printf("Using %d workers\n", b.NumFullfileWorkers)
 		fullfilesDir := filepath.Join(outputDir, b.MixVer, "files")
 		fullChrootDir := filepath.Join(b.Config.Builder.ServerStateDir, "image", b.MixVer, "full")
-		info, err := swupd.CreateFullfiles(mom.FullManifest, fullChrootDir, fullfilesDir, b.NumFullfileWorkers)
+		var info *swupd.FullfilesInfo
+		info, err = swupd.CreateFullfiles(mom.FullManifest, fullChrootDir, fullfilesDir, b.NumFullfileWorkers)
 		if err != nil {
 			return err
 		}
@@ -2073,7 +2074,7 @@ func (b *Builder) BuildDeltaPacksPreviousVersions(prev, to uint32, printReport b
 		go func() {
 			defer wg.Done()
 			for fromManifest := range versionQueue {
-				err := swupd.CreateAllDeltas(outputDir, int(fromManifest.Header.Version), int(toManifest.Header.Version), b.NumDeltaWorkers)
+				err = swupd.CreateAllDeltas(outputDir, int(fromManifest.Header.Version), int(toManifest.Header.Version), b.NumDeltaWorkers)
 				if err != nil {
 					deltaErrors = append(deltaErrors, err)
 				}

diff --git a/mixer/cmd/build.go b/mixer/cmd/build.go
@@ -332,7 +332,7 @@ var buildFormatOldCmd = &cobra.Command{
 			failf("Couldn't update Mix Version")
 		}
 		// Update the update/image/LAST_VER to the +20 build, since we built the +10 out of order
-		if err := ioutil.WriteFile(filepath.Join(b.Config.Builder.ServerStateDir, "image/LAST_VER"), []byte(strconv.Itoa(ver+10)), 0644); err != nil {
+		if err = ioutil.WriteFile(filepath.Join(b.Config.Builder.ServerStateDir, "image/LAST_VER"), []byte(strconv.Itoa(ver+10)), 0644); err != nil {
 			fail(err)
 		}
 		// Restore the new format in builder.conf