]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-build.git/commitdiff
build_utils.sh: Do not remove unwanted python3 versions 2018/head
authorDavid Galloway <dgallowa@redhat.com>
Thu, 26 May 2022 17:45:16 +0000 (13:45 -0400)
committerDavid Galloway <dgallowa@redhat.com>
Thu, 26 May 2022 17:45:16 +0000 (13:45 -0400)
For some reason, python36 is a dependency of python3-virtualenv.  python39 is not.

So removing python36 was removing python3-virtualenv.

Signed-off-by: David Galloway <dgallowa@redhat.com>
scripts/build_utils.sh

index c2acb2a823b76087a24bfbba9213ffffad6ec0c0..0e5bd6564cd6d007cde00fe9b39d625a0d724f56 100644 (file)
@@ -1656,10 +1656,6 @@ function retrycmd_if_failure() {
 function set_centos_python3_version() {
     # This function expects $1 to be a string like "python3.9"
     local EXPECTED_PYTHON3_VERSION=$1
-    local EXPECTED_PYTHON3_VERSION_MASHED=$(echo $EXPECTED_PYTHON3_VERSION | tr -d '.')
-    for package in $(rpm -qa | grep -E '^python3[1-9]{1,3}' | grep -v $EXPECTED_PYTHON3_VERSION_MASHED); do
-        sudo dnf remove -y $package
-    done
     sudo dnf reinstall -y $EXPECTED_PYTHON3_VERSION || sudo dnf install -y $EXPECTED_PYTHON3_VERSION
-    sudo alternatives --auto python3
+    sudo ln -fs /usr/bin/$EXPECTED_PYTHON3_VERSION /usr/bin/python3
 }