From 3cd41019b048349b42ec62d5602beb89bed9e975 Mon Sep 17 00:00:00 2001 From: Ian Wienand Date: Thu, 16 Apr 2020 13:06:07 +1000 Subject: [PATCH] lib/tls: use python3 to run inline script We only need to run this fixup for the active python now we are 3 only. Change-Id: I7616e5ee5693b2890fb7f6bd9052890a82904c22 --- lib/tls | 3 +-- stack.sh | 3 --- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/lib/tls b/lib/tls index 65ffeb937d..d05536b45d 100644 --- a/lib/tls +++ b/lib/tls @@ -369,8 +369,7 @@ function deploy_int_CA { function fix_system_ca_bundle_path { if is_service_enabled tls-proxy; then local capath - local python_cmd=${1:-python} - capath=$($python_cmd -c $'try:\n from requests import certs\n print (certs.where())\nexcept ImportError: pass') + capath=$(python3 -c $'try:\n from requests import certs\n print (certs.where())\nexcept ImportError: pass') if [[ ! $capath == "" && ! $capath =~ ^/etc/.* && ! -L $capath ]]; then if is_fedora; then diff --git a/stack.sh b/stack.sh index 0f1ddb1b3f..b59af404a4 100755 --- a/stack.sh +++ b/stack.sh @@ -968,9 +968,6 @@ fi if is_service_enabled tls-proxy; then fix_system_ca_bundle_path - if python3_enabled ; then - fix_system_ca_bundle_path python3 - fi fi # Extras Install