simplify if statement

mafredri · mafredri · commit 5fbcf2dfd0f3 · 2024-10-28T16:06:56.000Z
diff --git a/envbuilder.go b/envbuilder.go
@@ -1634,7 +1634,7 @@ func initDockerConfigOverride(logf log.Func, workingDir workingdir.WorkingDir, d
 		cfgPath         = workingDir.Join("config.json")
 		restoreEnv      = func() error { return nil } // noop.
 	)
-	if dockerConfigBase64 != "" || (dockerConfigBase64 == "" && oldDockerConfig == "") {
+	if dockerConfigBase64 != "" || oldDockerConfig == "" {
 		err := os.Setenv("DOCKER_CONFIG", newDockerConfig)
 		if err != nil {
 			logf(log.LevelError, "Failed to set DOCKER_CONFIG: %s", err)

Original file line number	Diff line number	Diff line change
`@@ -1634,7 +1634,7 @@ func initDockerConfigOverride(logf log.Func, workingDir workingdir.WorkingDir, d`
`1634`	`1634`	`cfgPath = workingDir.Join("config.json")`
`1635`	`1635`	`restoreEnv = func() error { return nil } // noop.`
`1636`	`1636`	`)`
`1637`		`- if dockerConfigBase64 != "" \|\| (dockerConfigBase64 == "" && oldDockerConfig == "") {`
	`1637`	`+ if dockerConfigBase64 != "" \|\| oldDockerConfig == "" {`
`1638`	`1638`	`err := os.Setenv("DOCKER_CONFIG", newDockerConfig)`
`1639`	`1639`	`if err != nil {`
`1640`	`1640`	`logf(log.LevelError, "Failed to set DOCKER_CONFIG: %s", err)`