From 75864a3afaacefb721fd40db8a92a7e5ae42ec99 Mon Sep 17 00:00:00 2001 From: Castulo Martinez Date: Mon, 26 Aug 2019 15:38:20 -0700 Subject: [PATCH] Always print "Removing bundle" when removing The "Removing bundle bundle_name" message was being shown only when multiple bundles where being deleted in the same command. This commit adds the message even if it is only one bundle being removed. Signed-off-by: Castulo Martinez --- src/bundle.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/bundle.c b/src/bundle.c index 01ba7511..c448c829 100644 --- a/src/bundle.c +++ b/src/bundle.c @@ -559,11 +559,6 @@ enum swupd_code remove_bundles(char **bundles) goto out_free_curl; } - /* only show this message if there are multiple bundles to be removed */ - if (*(bundles + 1) || total > 0) { - info("Removing bundle: %s\n", bundle); - } - current_mom = load_mom(current_version, false, mix_exists, NULL); if (!current_mom) { error("Unable to download/verify %d Manifest.MoM\n", current_version); @@ -572,6 +567,8 @@ enum swupd_code remove_bundles(char **bundles) goto out_free_curl; } + info("\nRemoving bundle: %s\n", bundle); + if (!search_bundle_in_manifest(current_mom, bundle)) { error("Bundle name is invalid, aborting removal\n"); ret = SWUPD_INVALID_BUNDLE;