This is an automated email from the ASF dual-hosted git repository.

alexey pushed a commit to branch branch-1.17.x
in repository https://gitbox.apache.org/repos/asf/kudu.git

commit bbb92ee91cb25947e4db8a311bb813925930d2ef
Author: Zoltan Martonka <[email protected]>
AuthorDate: Tue Jun 4 15:29:09 2024 +0000

    [build] bootstrap-dev-env.sh fix for ubuntu 22.04+
    
    On Ubuntu 22.04 python package is renamed to python2
    On 23.10 and 24.04 python2 is no longer available.
    We should just use python3 on newer platforms.
    
    Tested on: 18.04, 20.04. 22.04, 23.10, 24.04
    
    Change-Id: I275fa06214fde6ede1c6dd8e85f786fdc950cf8c
    Reviewed-on: http://gerrit.cloudera.org:8080/20559
    Tested-by: Kudu Jenkins
    Reviewed-by: Alexey Serbin <[email protected]>
    (cherry picked from commit 0ace3633fa22e04b8edc567669833c1615cd4ad9)
    Reviewed-on: http://gerrit.cloudera.org:8080/21986
---
 docker/bootstrap-dev-env.sh | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/docker/bootstrap-dev-env.sh b/docker/bootstrap-dev-env.sh
index 1c4773578..9e32100e2 100755
--- a/docker/bootstrap-dev-env.sh
+++ b/docker/bootstrap-dev-env.sh
@@ -115,6 +115,14 @@ elif [[ -f "/usr/bin/apt-get" ]]; then
   # Update the repo.
   apt-get update -y
 
+  source /etc/os-release
+
+  if dpkg --compare-versions "$VERSION_ID" ge "22.04"
+  then
+    apt-get install -y --no-install-recommends python3 python-is-python3
+  else
+    apt-get install -y --no-install-recommends python
+  fi
   # Install core build libraries.
   # --no-install-recommends keeps the install smaller
   apt-get install -y --no-install-recommends \
@@ -143,7 +151,6 @@ elif [[ -f "/usr/bin/apt-get" ]]; then
     openssl \
     patch \
     pkg-config \
-    python \
     rsync \
     sudo \
     unzip \

Reply via email to