keremet/rpm-ostree
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

app/status: no longer print pending info

Browse Source 
Prep for auto-updates. Let's not print the "Pending*" keys anymore. With
automatic updates, we'll have a whole other section of the output just
for that.

Closes: #1212
Approved by: cgwalters
This commit is contained in:
Jonathan Lebon 2018-01-17 20:27:03 +00:00 committed by Atomic Bot
parent a211e4670d
commit 2697af3135
1 changed files with 0 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/app/rpmostree-builtin-status.c
View File

@ -254,7 +254,6 @@ print_deployments (RPMOSTreeSysroot *sysroot_proxy,
guint64 t = 0; guint64 t = 0;
int serial; int serial;
gboolean is_booted; gboolean is_booted;
const gboolean was_first = first;
/* Add the long keys here */ /* Add the long keys here */
const guint max_key_len = MAX (strlen ("InactiveBaseReplacements"), const guint max_key_len = MAX (strlen ("InactiveBaseReplacements"),
strlen ("InterruptedLiveCommit")); strlen ("InterruptedLiveCommit"));
@ -396,39 +395,6 @@ print_deployments (RPMOSTreeSysroot *sysroot_proxy,
g_print ("%s%s", get_bold_end (), get_red_end ()); g_print ("%s%s", get_bold_end (), get_red_end ());
} }
/* Show any difference between the baseref vs head, but only for the
booted commit, and only if there isn't a pending deployment. Otherwise
it's either unnecessary or too noisy.
*/
if (is_booted && was_first)
{
const gchar *pending_checksum = NULL;
const gchar *pending_version = NULL;
if (g_variant_dict_lookup (dict, "pending-base-checksum", "&s", &pending_checksum))
{
rpmostree_print_kv (is_locally_assembled ? "PendingBaseCommit" : "PendingCommit",
max_key_len, pending_checksum);
g_assert (g_variant_dict_lookup (dict, "pending-base-timestamp", "t", &t));
g_variant_dict_lookup (dict, "pending-base-version", "&s", &pending_version);
if (pending_version)
{
g_autoptr(GDateTime) timestamp = g_date_time_new_from_unix_utc (t);
g_autofree char *version_time = NULL;
if (timestamp != NULL)
timestamp_string = g_date_time_format (timestamp, "%Y-%m-%d %T");
else
timestamp_string = g_strdup_printf ("(invalid timestamp)");
version_time = g_strdup_printf ("%s (%s)", pending_version, timestamp_string);
rpmostree_print_kv (is_locally_assembled ? "PendingBaseVersion" : "PendingVersion",
max_key_len, version_time);
}
}
}
/* This used to be OSName; see https://github.com/ostreedev/ostree/pull/794 */ /* This used to be OSName; see https://github.com/ostreedev/ostree/pull/794 */
if (opt_verbose) if (opt_verbose)
rpmostree_print_kv ("StateRoot", max_key_len, os_name); rpmostree_print_kv ("StateRoot", max_key_len, os_name);