From: Michael Fritch <mfritch@suse.com>
Date: Fri, 8 Dec 2023 18:17:29 +0000 (-0700)
Subject: cephadm: add runtime python minor version to RPM query macro
X-Git-Tag: v19.3.0~256^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=10b1580ecfdafff38c02581eb45a469b2b2b556d;p=ceph.git

cephadm: add runtime python minor version to RPM query macro

when multiple versions of python are installed, the `python3dist` macro
produces a multiline string causing later rpm query commands to fail.

Signed-off-by: Michael Fritch <mfritch@suse.com>
---

diff --git a/src/cephadm/build.py b/src/cephadm/build.py
index 1634eeac5931..63e70d91d234 100755
--- a/src/cephadm/build.py
+++ b/src/cephadm/build.py
@@ -328,7 +328,7 @@ def _install_rpm_deps(tempdir, config):
 
 def _deps_from_rpm(tempdir, config, dinfo, pkg):
     # first, figure out what rpm provides a particular python lib
-    dist = f'python3dist({pkg})'.lower()
+    dist = f'python3.{sys.version_info.minor}dist({pkg})'.lower()
     try:
         res = subprocess.run(
             ['rpm', '-q', '--whatprovides', dist],