]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
cephadm: add runtime python minor version to RPM query macro
authorMichael Fritch <mfritch@suse.com>
Fri, 8 Dec 2023 18:17:29 +0000 (11:17 -0700)
committerMichael Fritch <mfritch@suse.com>
Mon, 18 Dec 2023 14:55:02 +0000 (07:55 -0700)
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>
src/cephadm/build.py

index 1634eeac5931341e0126f509c2bfd1e504a9c060..63e70d91d2345ba3a7dc44611c82f7e4b5c5a503 100755 (executable)
@@ -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],