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

status: Add -b/--booted to only print that deployment

Browse Source 
It's usually what I want to paste into bug reports for example; I rarely want to
show the pending state or rollback.

Closes: #1260
Approved by: jlebon
This commit is contained in:
Colin Walters 2018-02-16 17:27:42 -05:00 committed by Atomic Bot
parent f54779df20
commit 2e25732ba1
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -47,6 +47,7 @@
static gboolean opt_pretty;
static gboolean opt_verbose;
static gboolean opt_json;
static gboolean opt_only_booted;
static const char *opt_jsonpath;
static GOptionEntry option_entries[] = {
@ -54,6 +55,7 @@ static GOptionEntry option_entries[] = {
{ "verbose", 'v', 0, G_OPTION_ARG_NONE, &opt_verbose, "Print additional fields (e.g. StateRoot)", NULL },
{ "json", 0, 0, G_OPTION_ARG_NONE, &opt_json, "Output JSON", NULL },
{ "jsonpath", 'J', 0, G_OPTION_ARG_STRING, &opt_jsonpath, "Filter JSONPath expression", "EXPRESSION" },
{ "booted", 'b', 0, G_OPTION_ARG_NONE, &opt_only_booted, "Only print the booted deployment", NULL },
{ NULL }
};
@ -421,6 +423,12 @@ print_deployments (RPMOSTreeSysroot *sysroot_proxy,
g_assert (g_variant_dict_lookup (dict, "serial", "i", &serial));
g_assert (g_variant_dict_lookup (dict, "checksum", "&s", &checksum));
if (!g_variant_dict_lookup (dict, "booted", "b", &is_booted))
is_booted = FALSE;
if (!is_booted && opt_only_booted)
continue;
if (g_variant_dict_lookup (dict, "origin", "&s", &origin_refspec))
{
origin_packages =
@ -457,9 +465,6 @@ print_deployments (RPMOSTreeSysroot *sysroot_proxy,
else
g_print ("\n");
if (!g_variant_dict_lookup (dict, "booted", "b", &is_booted))
is_booted = FALSE;
g_print ("%s ", is_booted ? libsd_special_glyph (BLACK_CIRCLE) : " ");
RpmOstreeRefspecType refspectype = RPMOSTREE_REFSPEC_TYPE_OSTREE;

4
tests/vmcheck/test-basic.sh
View File

@ -98,6 +98,10 @@ vm_assert_status_jq ".deployments[0][\"booted\"] == false" \
".deployments[1][\"booted\"] == true"
echo "ok rollback"
vm_rpmostree status -b > status.txt
assert_streq $(grep -F -e 'ostree://' status.txt | wc -l) "1"
echo "ok status -b"
# https://github.com/ostreedev/ostree/pull/1055
vm_cmd ostree commit -b vmcheck --tree=ref=vmcheck --timestamp=\"October 25 1985\"
if vm_rpmostree upgrade 2>err.txt; then