mirror of
https://github.com/clearlinux/swupd-client.git
synced 2026-09-07 14:11:52 +00:00
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 <castulo.martinez@intel.com>
This commit is contained in:
committed by
Otavio Pontes
parent
4ad3569266
commit
75864a3afa
+2
-5
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user