Don't print transaction in middle of upgrade overlay output
...but still do print it for `compose tree` and `container`. This is more followup to #403, where I noticed we were printing just the overlay transaction in the middle of `Overlaying...`. Since we're now printing the package diff again at the end, let's just rely on that rather than show the user over and over which packages they requested. Closes: #403 Closes: #404 Approved by: jlebon
This commit is contained in:
parent
8be495273e
commit
d153ecec9d
@ -320,6 +320,8 @@ install_packages_in_root (RpmOstreeTreeComposeContext *self,
|
||||
if (!rpmostree_context_prepare_install (ctx, &hifinstall, cancellable, error))
|
||||
goto out;
|
||||
|
||||
rpmostree_print_transaction (hifctx);
|
||||
|
||||
if (json_object_has_member (treedata, "add-files"))
|
||||
add_files = json_object_get_array_member (treedata, "add-files");
|
||||
|
||||
|
@ -301,6 +301,8 @@ rpmostree_container_builtin_assemble (int argc,
|
||||
if (!rpmostree_context_prepare_install (rocctx->ctx, &install, cancellable, error))
|
||||
goto out;
|
||||
|
||||
rpmostree_print_transaction (rpmostree_context_get_hif (rocctx->ctx));
|
||||
|
||||
/* --- Download as necessary --- */
|
||||
if (!rpmostree_context_download (rocctx->ctx, install, cancellable, error))
|
||||
goto out;
|
||||
@ -507,6 +509,8 @@ rpmostree_container_builtin_upgrade (int argc, char **argv, GCancellable *cancel
|
||||
cancellable, error))
|
||||
goto out;
|
||||
|
||||
rpmostree_print_transaction (rpmostree_context_get_hif (rocctx->ctx));
|
||||
|
||||
{ g_autofree char *new_state_sha512 = rpmostree_context_get_state_sha512 (rocctx->ctx);
|
||||
|
||||
if (strcmp (new_state_sha512, previous_state_sha512) == 0)
|
||||
|
@ -999,8 +999,6 @@ rpmostree_context_prepare_install (RpmOstreeContext *self,
|
||||
ret_install, error))
|
||||
goto out;
|
||||
|
||||
rpmostree_print_transaction (hifctx);
|
||||
|
||||
ret = TRUE;
|
||||
*out_install = g_steal_pointer (&ret_install);
|
||||
out:
|
||||
|
Loading…
Reference in New Issue
Block a user