From 05c402f269c0e89989021e919f1fa0458afb7fea Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: May 16 2023 09:16:22 +0000
Subject: import rpm-ostree-2022.10.115.g15eba7b1-2.el8_8


---

diff --git a/.gitignore b/.gitignore
index f34d08b..fba7ef7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/rpm-ostree-2022.10.112.g3d0ac35b.tar.xz
+SOURCES/rpm-ostree-2022.10.115.g15eba7b1.tar.xz
diff --git a/.rpm-ostree.metadata b/.rpm-ostree.metadata
index f770273..ec0a514 100644
--- a/.rpm-ostree.metadata
+++ b/.rpm-ostree.metadata
@@ -1 +1 @@
-cdce35bda2d188e33f236e06b4c6e1d39bf5f71b SOURCES/rpm-ostree-2022.10.112.g3d0ac35b.tar.xz
+4ddb108fc95d35d6fce3925410459ec2452d7c5d SOURCES/rpm-ostree-2022.10.115.g15eba7b1.tar.xz
diff --git a/SOURCES/0001-daemon-Make-failure-to-query-base-image-non-fatal.patch b/SOURCES/0001-daemon-Make-failure-to-query-base-image-non-fatal.patch
deleted file mode 100644
index aed7df0..0000000
--- a/SOURCES/0001-daemon-Make-failure-to-query-base-image-non-fatal.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From a0f1275dfbd835b704355d095e610ac1f1254f25 Mon Sep 17 00:00:00 2001
-From: Colin Walters <walters@verbum.org>
-Date: Sun, 11 Dec 2022 13:40:15 -0500
-Subject: [PATCH] daemon: Make failure to query base image non-fatal
-
-We had a GC bug which then propagates into a hard daemon
-failure right now because we try to gather data on all deployments.
-
-Make this non-fatal; we should try to stumble forward as much
-as possible so that one can e.g. perform an upgrade operation.
-
-(cherry picked from commit 8dd45f293afc1ca32b42bda86dde47c66e652dda)
----
- src/app/rpmostree-builtin-status.cxx       | 12 +++++++++---
- src/daemon/rpmostreed-deployment-utils.cxx | 20 ++++++++++++++------
- 2 files changed, 23 insertions(+), 9 deletions(-)
-
-diff --git a/src/app/rpmostree-builtin-status.cxx b/src/app/rpmostree-builtin-status.cxx
-index cec0a2e3..ee82e589 100644
---- a/src/app/rpmostree-builtin-status.cxx
-+++ b/src/app/rpmostree-builtin-status.cxx
-@@ -688,9 +688,15 @@ print_one_deployment (RPMOSTreeSysroot *sysroot_proxy, GVariant *child, gint ind
-           break;
-         case rpmostreecxx::RefspecType::Container:
-           {
--            g_assert (g_variant_dict_lookup (dict, "container-image-reference-digest", "s",
--                                             &container_image_reference_digest));
--            g_print ("%s", origin_refspec);
-+            if (g_variant_dict_lookup (dict, "container-image-reference-digest", "s",
-+                                       &container_image_reference_digest))
-+              {
-+                g_print ("%s", origin_refspec);
-+              }
-+            else
-+              {
-+                g_print ("(error fetching image metadata)");
-+              }
-           }
-           break;
-         }
-diff --git a/src/daemon/rpmostreed-deployment-utils.cxx b/src/daemon/rpmostreed-deployment-utils.cxx
-index b7b27fed..48480509 100644
---- a/src/daemon/rpmostreed-deployment-utils.cxx
-+++ b/src/daemon/rpmostreed-deployment-utils.cxx
-@@ -214,12 +214,20 @@ rpmostreed_deployment_generate_variant (OstreeSysroot *sysroot, OstreeDeployment
-     case rpmostreecxx::RefspecType::Container:
-       {
-         g_variant_dict_insert (dict, "container-image-reference", "s", refspec);
--        CXX_TRY_VAR (state, rpmostreecxx::query_container_image_commit (*repo, base_checksum),
--                     error);
--        g_variant_dict_insert (dict, "container-image-reference-digest", "s",
--                               state->image_digest.c_str ());
--        if (state->version.size () > 0)
--          g_variant_dict_insert (dict, "version", "s", state->version.c_str ());
-+        // For now, make this non-fatal https://github.com/coreos/rpm-ostree/issues/4185
-+        try
-+          {
-+            auto state = rpmostreecxx::query_container_image_commit (*repo, base_checksum);
-+            g_variant_dict_insert (dict, "container-image-reference-digest", "s",
-+                                   state->image_digest.c_str ());
-+            if (state->version.size () > 0)
-+              g_variant_dict_insert (dict, "version", "s", state->version.c_str ());
-+          }
-+        catch (std::exception &e)
-+          {
-+            sd_journal_print (LOG_ERR, "failed to query container image base metadata: %s",
-+                              e.what ());
-+          }
-       }
-       break;
-     case rpmostreecxx::RefspecType::Checksum:
--- 
-2.31.1
-
diff --git a/SPECS/rpm-ostree.spec b/SPECS/rpm-ostree.spec
index 0facedd..e8cf2f6 100644
--- a/SPECS/rpm-ostree.spec
+++ b/SPECS/rpm-ostree.spec
@@ -3,16 +3,14 @@
 
 Summary: Hybrid image/package system
 Name: rpm-ostree
-Version: 2022.10.112.g3d0ac35b
-Release: 3%{?dist}
+Version: 2022.10.115.g15eba7b1
+Release: 2%{?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.  This is generated from the "rhel8" branch.
 Source0: https://github.com/coreos/rpm-ostree/releases/download/v%{version}/rpm-ostree-%{version}.tar.xz
 
-Patch0: 0001-daemon-Make-failure-to-query-base-image-non-fatal.patch 
-
 ExclusiveArch: %{rust_arches}
 
 BuildRequires: make
@@ -229,6 +227,9 @@ $PYTHON autofiles.py > files.devel \
 %files devel -f files.devel
 
 %changelog
+* Mon Mar 13 2023 Colin Walters <walters@verbum.org> - 2022.10.115.g15eba7b1-2
+- Resolves: rhbz#2177225
+
 * Thu Feb 16 2023 Colin Walters <walters@verbum.org> - 2022.10.112.g3d0ac35b-3
 - Cherry pick
   https://github.com/coreos/rpm-ostree/pull/4311/commits/a0f1275dfbd835b704355d095e610ac1f1254f25