From: Michael Fritch <mfritch@suse.com>
Date: Thu, 18 Nov 2021 22:08:45 +0000 (-0700)
Subject: cephadm: zipapp module requires Python35 or later
X-Git-Tag: v18.0.0~7^2~17
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=47834f0e699bb9e5c4ceb444d7616fc0e26b1336;p=ceph-ci.git

cephadm: zipapp module requires Python35 or later

Signed-off-by: Michael Fritch <mfritch@suse.com>
---

diff --git a/src/cephadm/build.sh b/src/cephadm/build.sh
index 94e8a3247c9..abf3290c607 100755
--- a/src/cephadm/build.sh
+++ b/src/cephadm/build.sh
@@ -31,8 +31,11 @@ if [[ "$version" =~ ^Python[[:space:]]([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:
 
     compress=""
     if [[ "$major" -ge 3 && "$minor" -ge 7 ]]; then
-        echo "Pyton version compatible with --compress, compressing cephadm binary"
+        echo "Python version compatible with --compress, compressing cephadm binary"
         compress="--compress"
+    elif [[ "$major" -lt 3 || "$major" -eq 3 && "$minor" -lt 5 ]]; then
+	echo "zipapp module requires Python35 or greater"
+	exit 1
     fi
 
     $PYTHON -mzipapp -p $PYTHON ${builddir} ${compress} --output $target_fpath