From 5bd747fb3ea6f8204c8da2212225c039a4e48be2 Mon Sep 17 00:00:00 2001 From: Otavio Pontes Date: Fri, 13 Sep 2019 14:03:56 -0700 Subject: [PATCH] Revert "Always print "Removing bundle" when removing" This reverts commit 75864a3afaacefb721fd40db8a92a7e5ae42ec99. --- src/bundle.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/bundle.c b/src/bundle.c index c448c829..01ba7511 100644 --- a/src/bundle.c +++ b/src/bundle.c @@ -559,6 +559,11 @@ 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); @@ -567,8 +572,6 @@ 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;