sig_cloud/diskimage-builder
11
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

simple-init: Use wrappers to call pip for glean install

Browse source 
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
This commit is contained in:
Ian Wienand 2019-09-30 02:28:52 +00:00
parent cbe1a0fc6b
commit 643415f366
2 changed files with 2 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
diskimage_builder/elements/simple-init/install.d/simple-init-repo-install/40-glean
View file

@ -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

6
diskimage_builder/elements/simple-init/install.d/simple-init-source-install/40-glean
View file

@ -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