ceph-19.2.3, rhbz#2310236

2025-08-13 08:33:04 -04:00
parent be4504721e
commit 09ccc8e9b9
2 changed files with 42 additions and 1 deletions
@@ -0,0 +1,37 @@
+From 8c78a22d2cf69892570f635735d9735169b64a75 Mon Sep 17 00:00:00 2001
+From: Peter Sabaini <peter.sabaini@canonical.com>
+Date: Wed, 11 Sep 2024 16:56:50 +0200
+Subject: [PATCH] ceph-volume: fix importlib.metadata compat
+
+The importlib.metadata library removed older shims in releases >5.0.0
+where EntryPoints objects use .select() instead of dict-like access.
+
+Fixes: https://tracker.ceph.com/issues/68032
+
+Signed-off-by: Peter Sabaini <peter.sabaini@canonical.com>
+---
+ src/ceph-volume/ceph_volume/main.py | 10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/src/ceph-volume/ceph_volume/main.py b/src/ceph-volume/ceph_volume/main.py
+index f8eca65ec497c..4f27f429e89e2 100644
+--- a/src/ceph-volume/ceph_volume/main.py
+++ b/src/ceph-volume/ceph_volume/main.py
+@@ -11,8 +11,16 @@
+     from importlib.metadata import entry_points
+ 
+     def get_entry_points(group: str):  # type: ignore
+-        return entry_points().get(group, [])  # type: ignore
+        eps = entry_points()
+        if hasattr(eps, 'select'):
+            # New importlib.metadata uses .select()
+            return eps.select(group=group)
+        else:
+            # Fallback to older EntryPoints that returns dicts
+            return eps.get(group, [])  # type: ignore
+
+ except ImportError:
+    # Fallback to `pkg_resources` for older versions
+     from pkg_resources import iter_entry_points as entry_points  # type: ignore
+ 
+     def get_entry_points(group: str):  # type: ignore
@@ -185,7 +185,7 @@
 #################################################################################
 Name:		ceph
 Version:	19.2.3
-Release:	2%{?dist}
+Release:	3%{?dist}
 %if 0%{?fedora} || 0%{?rhel}
 Epoch:		2
 %endif
@@ -228,6 +228,7 @@ Patch:		0052-src-tracing.patch
 Patch:		0053-src-test-neorados-common_tests.h.patch
 Patch:		0055-python314.patch
 Patch:		0056-libarrow-20.0.0.patch
+Patch:		0057-src-ceph-volume-ceph-volume-main.py.patch

 # ceph 14.0.1 does not support 32-bit architectures, bugs #1727788, #1727787
 ExcludeArch:	i686 armv7hl
@@ -2744,6 +2745,9 @@ exit 0
 %{python3_sitelib}/ceph_node_proxy-*

 %changelog
+* Wed Aug 13 2025 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:19.2.3-3
+- ceph-19.2.3, rhbz#2310236
+
 * Wed Aug 06 2025 František Zatloukal <fzatlouk@redhat.com> - 2:19.2.3-2
 - Rebuilt for icu 77.1