From: Guillaume Lambert <guillaume.lambert@orange.com>
Date: Mon, 3 May 2021 13:22:38 +0000 (+0200)
Subject: Add protection in python-tools-install.sh
X-Git-Tag: v0.63.1~14
X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F50%2F67550%2F1;p=releng%2Fglobal-jjb.git

Add protection in python-tools-install.sh

This script may result in unexpected behavior on distributions
other than Ubuntu with a matching release.
DISTRIB_ID must be tested to avoid such problems.

Signed-off-by: Guillaume Lambert <guillaume.lambert@orange.com>
Change-Id: I2ba02b613a4aaadfeb09bd66ddfde8f36a9510b4
---

diff --git a/shell/python-tools-install.sh b/shell/python-tools-install.sh
index 59783053..e0e4eec1 100644
--- a/shell/python-tools-install.sh
+++ b/shell/python-tools-install.sh
@@ -45,7 +45,7 @@ EOF
     if [[ -f /etc/lsb-release ]]; then
        # shellcheck disable=SC1091
        source /etc/lsb-release
-       if [[ $DISTRIB_RELEASE == "16.04" ]]; then
+       if [[ $DISTRIB_RELEASE == "16.04" && $DISTRIB_ID == "Ubuntu" ]]; then
          echo "WARNING: Python projects should move to Ubuntu 18.04 to continue receiving support"
          echo "zipp==1.1.0" >> "$requirements_file"
        fi