From 24dc23ac3b25ac931eaaf8aeffcb5fb2334af5df Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 4 Feb 2025 12:01:50 +0100 Subject: [PATCH] main: fix auto-detected distro that is non-visible, tweak order This commit fixes the issue that the auto-detect distro is not visible in the progress message. It also tweaks the order of the message to show: ``` Building manifest for - ``` to be more conistent. Closes: https://github.com/osbuild/image-builder-cli/issues/121 --- cmd/image-builder/main.go | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/cmd/image-builder/main.go b/cmd/image-builder/main.go index 909d68b..1f5fa76 100644 --- a/cmd/image-builder/main.go +++ b/cmd/image-builder/main.go @@ -112,10 +112,6 @@ func cmdManifestWrapper(pbar progress.ProgressBar, cmd *cobra.Command, args []st return nil, err } - imgTypeStr := args[0] - pbar.SetPulseMsgf("Manifest generation step") - pbar.SetMessagef("Building manifest for %s-%s", imgTypeStr, distroStr) - bp, err := blueprintload.Load(blueprintPath) if err != nil { return nil, err @@ -125,6 +121,9 @@ func cmdManifestWrapper(pbar progress.ProgressBar, cmd *cobra.Command, args []st if err != nil { return nil, err } + imgTypeStr := args[0] + pbar.SetPulseMsgf("Manifest generation step") + pbar.SetMessagef("Building manifest for %s-%s", distroStr, imgTypeStr) img, err := getOneImage(dataDir, distroStr, imgTypeStr, archStr) if err != nil {