From 7b852b5a3ae9c76643abd39cc5308b95726618e4 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Apr 04 2023 08:52:29 +0000
Subject: import rpm-ostree-2022.10.90.g4abaf4b4-6.el8_7


---

diff --git a/SOURCES/0002-fix-printing-commits-on-status.patch b/SOURCES/0002-fix-printing-commits-on-status.patch
new file mode 100644
index 0000000..bf9cf2d
--- /dev/null
+++ b/SOURCES/0002-fix-printing-commits-on-status.patch
@@ -0,0 +1,29 @@
+diff --color -urN rpm-ostree-2022.10.90.g4abaf4b4-orig/src/app/rpmostree-builtin-status.cxx rpm-ostree-2022.10.90.g4abaf4b4/src/app/rpmostree-builtin-status.cxx
+--- rpm-ostree-2022.10.90.g4abaf4b4-orig/src/app/rpmostree-builtin-status.cxx	2022-08-16 08:40:32.000000000 -0400
++++ rpm-ostree-2022.10.90.g4abaf4b4/src/app/rpmostree-builtin-status.cxx	2023-02-07 19:56:17.018048420 -0500
+@@ -489,10 +489,7 @@
+   g_autoptr (GVariant) reposdata = g_variant_dict_lookup_value (
+       commit_meta, "rpmostree.rpmmd-repos", G_VARIANT_TYPE ("aa{sv}"));
+ 
+-  if (!reposdata)
+-    return;
+-
+-  const guint n = g_variant_n_children (reposdata);
++  const guint n = reposdata ? g_variant_n_children (reposdata) : 0;
+   if (n == 0 || !opt_verbose)
+     {
+       /* no repos to print, so this is just a pure kv print */
+diff --color -urN rpm-ostree-2022.10.90.g4abaf4b4-orig/tests/vmcheck/test-misc-2.sh rpm-ostree-2022.10.90.g4abaf4b4/tests/vmcheck/test-misc-2.sh
+--- rpm-ostree-2022.10.90.g4abaf4b4-orig/tests/vmcheck/test-misc-2.sh	2022-08-16 08:40:32.000000000 -0400
++++ rpm-ostree-2022.10.90.g4abaf4b4/tests/vmcheck/test-misc-2.sh	2023-02-07 19:57:05.111019172 -0500
+@@ -26,6 +26,10 @@
+ 
+ # More miscellaneous tests
+ 
++# Verify that the commit is printed in the output
++vm_rpmostree status > status.txt
++assert_file_has_content status.txt 'Commit:'
++
+ # Locked finalization
+ booted_csum=$(vm_get_booted_csum)
+ commit=$(vm_cmd ostree commit -b vmcheck --tree=ref=vmcheck)
diff --git a/SPECS/rpm-ostree.spec b/SPECS/rpm-ostree.spec
index feb295a..3eb8acc 100644
--- a/SPECS/rpm-ostree.spec
+++ b/SPECS/rpm-ostree.spec
@@ -4,7 +4,7 @@
 Summary: Hybrid image/package system
 Name: rpm-ostree
 Version: 2022.10.90.g4abaf4b4
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: LGPLv2+
 URL: https://github.com/coreos/rpm-ostree
 # This tarball is generated via "cd packaging && make -f Makefile.dist-packaging dist-snapshot"
@@ -13,6 +13,7 @@ Source0: https://github.com/coreos/rpm-ostree/releases/download/v%{version}/rpm-
 
 # https://bugzilla.redhat.com/show_bug.cgi?id=2137905
 Patch0: 0001-compose-Handle-embedded-whiteouts.patch
+Patch1: 0002-fix-printing-commits-on-status.patch
 
 ExclusiveArch: %{rust_arches}
 
@@ -230,6 +231,11 @@ $PYTHON autofiles.py > files.devel \
 %files devel -f files.devel
 
 %changelog
+* Wed Feb 15 2023 Joseph Marrero <jmarrero@redhat.com> - 2022.10.90.g4abaf4b4-6
+- Backport
+  https://github.com/coreos/rpm-ostree/commit/9dc5dcd0594d122172493695e31b0c63e7ea2e74
+  Resolves: rhbz#2167476
+
 * Tue Dec 13 2022 Colin Walters <walters@verbum.org> - 2022.10.90.g4abaf4b4-5
 - Backport
   https://github.com/coreos/rpm-ostree/commit/0049dbdd91cc0c1900132374645c5114063db04d