Merge pull request containers#9595 from Luap99/fix-9594

Fix possible panic with podman build --iidfile
mheon · Mar 3, 2021 · 32b2e36 · 32b2e36
2 parents 8a1955f + 4eed89a
commit 32b2e36
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/cmd/podman/images/build.go b/cmd/podman/images/build.go
@@ -265,6 +265,9 @@ func build(cmd *cobra.Command, args []string) error {
 	}
 
 	report, err := registry.ImageEngine().Build(registry.GetContext(), containerFiles, *apiBuildOpts)
+	if err != nil {
+		return err
+	}
 
 	if cmd.Flag("iidfile").Changed {
 		f, err := os.Create(buildOpts.Iidfile)
@@ -276,7 +279,7 @@ func build(cmd *cobra.Command, args []string) error {
 		}
 	}
 
-	return err
+	return nil
 }
 
 // buildFlagsWrapperToOptions converts the local build flags to the build options used