app/status: Group EVRs for RemovedBasePackages if possible

The same way we abbreviate ReplacedBasePackages when there are matching EVR diffs, let's do something similar for RemovedBasePackages for matching EVRs. Solves #1784 Signed-off-by: Rafael Fonseca <[email protected]> Closes: #1852 Approved by: jlebon
coreos · Jun 18, 2019 · d0f90ca · d0f90ca
1 parent dbf28ac
commit d0f90ca
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 8 deletions.
diff --git a/src/app/rpmostree-builtin-status.c b/src/app/rpmostree-builtin-status.c
@@ -703,25 +703,50 @@ print_one_deployment (RPMOSTreeSysroot *sysroot_proxy,
   g_autoptr(GPtrArray) active_removals = g_ptr_array_new_with_free_func (g_free);
   if (origin_base_removals)
     {
-      g_autoptr(GPtrArray) active_removals_nevra = g_ptr_array_new_with_free_func (g_free);
+      g_autoptr(GString) str = g_string_new ("");
+      g_autoptr(GHashTable) grouped_evrs =
+        g_hash_table_new_full (g_str_hash, g_str_equal, g_free,
+                               (GDestroyNotify)g_ptr_array_unref);
+
       const guint n = g_variant_n_children (origin_base_removals);
       for (guint i = 0; i < n; i++)
         {
           g_autoptr(GVariant) gv_nevra;
           g_variant_get_child (origin_base_removals, i, "v", &gv_nevra);
-          const char *name, *nevra;
-          g_variant_get_child (gv_nevra, 0, "&s", &nevra);
+          const char *name;
           g_variant_get_child (gv_nevra, 1, "&s", &name);
           g_ptr_array_add (active_removals, g_strdup (name));
-          g_ptr_array_add (active_removals_nevra, g_strdup (nevra));
+
+          gv_nevra_to_evr (str, gv_nevra);
+          const char *evr = str->str;
+          GPtrArray *pkgs = g_hash_table_lookup (grouped_evrs, evr);
+          if (!pkgs)
+            {
+              pkgs = g_ptr_array_new_with_free_func (g_free);
+              g_hash_table_insert (grouped_evrs, g_strdup (evr), pkgs);
+            }
+          g_ptr_array_add (pkgs, g_strdup (name));
+          g_string_erase (str, 0, -1);
         }
       g_ptr_array_add (active_removals, NULL);
-      if (active_removals_nevra->len > 0 )
+
+      GLNX_HASH_TABLE_FOREACH_KV (grouped_evrs, const char*, evr, GPtrArray*, pkgs)
         {
-          g_ptr_array_add (active_removals_nevra, NULL);
-          print_packages ("RemovedBasePackages", max_key_len,
-                          (const char *const*)active_removals_nevra->pdata, NULL);
+          if (str->len)
+            g_string_append (str, ", ");
+
+          for (guint i = 0, n = pkgs->len; i < n; i++)
+            {
+              const char *pkgname = g_ptr_array_index (pkgs, i);
+              if (i > 0)
+                g_string_append_c (str, ' ');
+              g_string_append (str, pkgname);
+            }
+          g_string_append_printf (str, " %s", evr);
         }
+
+      if (str->len)
+        rpmostree_print_kv ("RemovedBasePackages", max_key_len, str->str);
     }
 
   /* only print inactive base removal requests in verbose mode */

diff --git a/tests/vmcheck/test-override-remove.sh b/tests/vmcheck/test-override-remove.sh
@@ -109,6 +109,8 @@ vm_cmd "test -d ${newroot}/usr/lib && \
         test '!' -f ${newroot}/usr/lib/foo/foo.txt && \
         test '!' -f ${newroot}/usr/lib/foo/shared.txt && \
         test '!' -d ${newroot}/usr/lib/foo"
+vm_cmd rpm-ostree status > status.txt
+assert_file_has_content status.txt '\(foo bar\|bar foo\) 1\.0-1'
 echo "ok override remove foo and bar"
 
 vm_cmd ostree commit -b vmcheck --tree=ref=vmcheck