diff options
| author | Michael Fritch <mfritch@suse.com> | 2023-12-08 19:17:29 +0100 |
|---|---|---|
| committer | Michael Fritch <mfritch@suse.com> | 2023-12-18 15:55:02 +0100 |
| commit | 10b1580ecfdafff38c02581eb45a469b2b2b556d (patch) | |
| tree | d65f128be923b713548d2445d3d3744e48bf3069 /src/cephadm | |
| parent | Merge pull request #53227 from Matan-B/wip-matanb-cleanup-stale-osdmap (diff) | |
| download | ceph-10b1580ecfdafff38c02581eb45a469b2b2b556d.tar.xz ceph-10b1580ecfdafff38c02581eb45a469b2b2b556d.zip | |
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>
Diffstat (limited to 'src/cephadm')
| -rwxr-xr-x | src/cephadm/build.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/cephadm/build.py b/src/cephadm/build.py index 1634eeac593..63e70d91d23 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], |