From 0d9b0db5ca4d6d4c7f0a8886556e460da786ba15 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Apr 11 2023 14:13:06 +0000
Subject: import rpm-ostree-2022.12-3.el9_1


---

diff --git a/SOURCES/0000-fix-printing-commits-on-status.patch b/SOURCES/0000-fix-printing-commits-on-status.patch
new file mode 100644
index 0000000..bf9cf2d
--- /dev/null
+++ b/SOURCES/0000-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 07f7c2b..46408b2 100644
--- a/SPECS/rpm-ostree.spec
+++ b/SPECS/rpm-ostree.spec
@@ -4,12 +4,13 @@
 Summary: Hybrid image/package system
 Name: rpm-ostree
 Version: 2022.12
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: LGPLv2+
 URL: https://github.com/coreos/rpm-ostree
 # This tarball is generated via "cd packaging && make -f Makefile.dist-packaging dist-snapshot"
 # in the upstream git.  It also contains vendored Rust sources.
 Source0: https://github.com/coreos/rpm-ostree/releases/download/v%{version}/rpm-ostree-%{version}.tar.xz
+Patch0: 0000-fix-printing-commits-on-status.patch
 
 ExclusiveArch: %{rust_arches}
 
@@ -246,6 +247,9 @@ $PYTHON autofiles.py > files.devel \
 
 %files devel -f files.devel
 %changelog
+* Wed Feb 15 2023 Joseph Marrero <jmarrero@redhat.com> - 2022.12-3
+- Resolves: rhbz#2167477
+
 * Tue Jul 19 2022 Colin Walters <walters@verbum.org> - 2022.12-2
 - https://github.com/coreos/rpm-ostree/releases/tag/v2022.12