From 643415f36653e177fe24ff6fd3af06abff08eb5d Mon Sep 17 00:00:00 2001 From: Ian Wienand Date: Mon, 30 Sep 2019 02:28:52 +0000 Subject: [PATCH] simple-init: Use wrappers to call pip for glean install Use the wrapper calls from Ia267a60eecfa8f4071dd477d86daebe07e9a7e38 to install glean. Using this wrapper means we cover all cases without more and more branches; it should work for python2, python3 and also the special case of RHEL/CentOS where dib-python points to the special /usr/libexec/platform-python (which is python3.6 with inbuilt pip) Change-Id: If624e8bb66ce0761fc0d5f34c2bed8b93a7daeee --- .../simple-init/install.d/simple-init-repo-install/40-glean | 6 +----- .../install.d/simple-init-source-install/40-glean | 6 +----- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/diskimage_builder/elements/simple-init/install.d/simple-init-repo-install/40-glean b/diskimage_builder/elements/simple-init/install.d/simple-init-repo-install/40-glean index 18211e86..a7491ab9 100755 --- a/diskimage_builder/elements/simple-init/install.d/simple-init-repo-install/40-glean +++ b/diskimage_builder/elements/simple-init/install.d/simple-init-repo-install/40-glean @@ -21,8 +21,4 @@ fi set -eu set -o pipefail -if [ "$DIB_PYTHON_VERSION" == "3" ]; then - pip3 install /tmp/glean.git -else - pip install /tmp/glean.git -fi +$DIB_PYTHON_PIP install /tmp/glean.git diff --git a/diskimage_builder/elements/simple-init/install.d/simple-init-source-install/40-glean b/diskimage_builder/elements/simple-init/install.d/simple-init-source-install/40-glean index ae1ce320..4dd685ad 100755 --- a/diskimage_builder/elements/simple-init/install.d/simple-init-source-install/40-glean +++ b/diskimage_builder/elements/simple-init/install.d/simple-init-source-install/40-glean @@ -21,8 +21,4 @@ fi set -eu set -o pipefail -if [ "$DIB_PYTHON_VERSION" == "3" ]; then - pip3 install glean -else - pip install glean -fi +$DIB_PYTHON_PIP install glean