From ea54fd0f687a1c4bccfeda89f5ebc0eb527a3dbb Mon Sep 17 00:00:00 2001 From: Alexander Larsson Date: Tue, 10 Apr 2018 11:32:12 +0200 Subject: [PATCH] repo: Show end-of-life info with branches Closes: #1566 Approved by: alexlarsson --- app/flatpak-builtins-repo.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/app/flatpak-builtins-repo.c b/app/flatpak-builtins-repo.c index 6f12520c..e5f8cb01 100644 --- a/app/flatpak-builtins-repo.c +++ b/app/flatpak-builtins-repo.c @@ -82,7 +82,9 @@ static void print_branches (GVariant *meta) { g_autoptr(GVariant) cache = NULL; + g_autoptr(GVariant) sparse_cache = NULL; + g_variant_lookup (meta, "xa.sparse-cache", "@a{sa{sv}}", &sparse_cache); cache = g_variant_lookup_value (meta, "xa.cache", NULL); if (cache) { @@ -98,6 +100,7 @@ print_branches (GVariant *meta) flatpak_table_printer_set_column_title (printer, 0, _("Ref")); flatpak_table_printer_set_column_title (printer, 1, _("Installed")); flatpak_table_printer_set_column_title (printer, 2, _("Download")); + flatpak_table_printer_set_column_title (printer, 3, _("Options")); refdata = g_variant_get_variant (cache); g_variant_iter_init (&iter, refdata); @@ -109,6 +112,22 @@ print_branches (GVariant *meta) flatpak_table_printer_add_column (printer, ref); flatpak_table_printer_add_decimal_column (printer, installed); flatpak_table_printer_add_decimal_column (printer, download); + + flatpak_table_printer_add_column (printer, ""); /* Options */ + + if (sparse_cache) + { + g_autoptr(GVariant) sparse = NULL; + if (g_variant_lookup (sparse_cache, ref, "@a{sv}", &sparse)) + { + const char *eol; + if (g_variant_lookup (sparse, "eol", "&s", &eol)) + flatpak_table_printer_append_with_comma_printf (printer, "eol=%s", eol); + if (g_variant_lookup (sparse, "eolr", "&s", &eol)) + flatpak_table_printer_append_with_comma_printf (printer, "eol-rebase=%s", eol); + } + } + flatpak_table_printer_finish_row (printer); }