mirror of
https://anongit.gentoo.org/git/repo/gentoo.git
synced 2025-06-08 06:09:43 +02:00
45 lines
1.7 KiB
Diff
45 lines
1.7 KiB
Diff
https://bugs.gentoo.org/941069
|
|
https://tracker.ceph.com/issues/68032
|
|
https://github.com/ceph/ceph/pull/59739
|
|
|
|
From 12cc90a8dac62824c9326f5a4b31744c3f2bf10b 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>
|
|
--- a/src/ceph-volume/ceph_volume/main.py
|
|
+++ b/src/ceph-volume/ceph_volume/main.py
|
|
@@ -9,15 +9,25 @@
|
|
# `entry_points` from `importlib.metadata` does not.
|
|
try:
|
|
from importlib.metadata import entry_points
|
|
+ from importlib.metadata import EntryPoints
|
|
|
|
def get_entry_points(group: str): # type: ignore
|
|
- return entry_points().get(group, []) # type: ignore
|
|
+ eps = entry_points()
|
|
+ if isinstance(eps, EntryPoints) and 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
|
|
return entry_points(group=group) # type: ignore
|
|
|
|
+
|
|
from ceph_volume.decorators import catches
|
|
from ceph_volume import log, devices, configuration, conf, exceptions, terminal, inventory, drive_group, activate
|
|
|
|
|