From: John Mulligan <jmulligan@redhat.com>
Date: Fri, 14 Jun 2024 14:07:07 +0000 (-0400)
Subject: script/cpatch.py: add support for multiple valid python versions
X-Git-Tag: v20.0.0~1726^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F58054%2Fhead;p=ceph.git

script/cpatch.py: add support for multiple valid python versions

Fix running cpatch.py with the latest centos9s based container images.
Future proof a little by adding multiple valid, existing, python version
numbers to probe.

Signed-off-by: John Mulligan <jmulligan@redhat.com>
---

diff --git a/src/script/cpatch.py b/src/script/cpatch.py
index fa1cecc5943b..4ff9bd999d21 100755
--- a/src/script/cpatch.py
+++ b/src/script/cpatch.py
@@ -549,9 +549,9 @@ class Builder:
         if self._cached_py_site_packages is not None:
             return self._cached_py_site_packages
         # use the container image to probe for the correct python site-packages dir
+        py_vers = ['3.12', '3.11', '3.10', '3.9', '3.8', '3.6']
         valid_site_packages = [
-            "/usr/lib/python3.8/site-packages",
-            "/usr/lib/python3.6/site-packages",
+            f'/usr/lib/python{v}/site-packages' for v in py_vers
         ]
         cmd = [
             self._ctx.engine,