simplify return

mafredri · mafredri · commit d559c1d3eb4e · 2024-10-28T16:14:24.000Z
diff --git a/envbuilder.go b/envbuilder.go
@@ -1647,9 +1647,9 @@ func initDockerConfigOverride(logf log.Func, workingDir workingdir.WorkingDir, d
 			if oldDockerConfig == "" {
 				err := os.Unsetenv("DOCKER_CONFIG")
 				if err != nil {
-					err = fmt.Errorf("unset DOCKER_CONFIG: %w", err)
+					return fmt.Errorf("unset DOCKER_CONFIG: %w", err)
 				}
-				return err
+				return nil
 			}
 			err := os.Setenv("DOCKER_CONFIG", oldDockerConfig)
 			if err != nil {

Original file line number	Diff line number	Diff line change
`@@ -1647,9 +1647,9 @@ func initDockerConfigOverride(logf log.Func, workingDir workingdir.WorkingDir, d`
`1647`	`1647`	`if oldDockerConfig == "" {`
`1648`	`1648`	`err := os.Unsetenv("DOCKER_CONFIG")`
`1649`	`1649`	`if err != nil {`
`1650`		`- err = fmt.Errorf("unset DOCKER_CONFIG: %w", err)`
	`1650`	`+ return fmt.Errorf("unset DOCKER_CONFIG: %w", err)`
`1651`	`1651`	`}`
`1652`		`- return err`
	`1652`	`+ return nil`
`1653`	`1653`	`}`
`1654`	`1654`	`err := os.Setenv("DOCKER_CONFIG", oldDockerConfig)`
`1655`	`1655`	`if err != nil {`