From 0eaeadad8724ee3eefca81a5302e750101f24de9 Mon Sep 17 00:00:00 2001 From: Shane McDonald Date: Fri, 22 Mar 2019 12:10:47 -0400 Subject: Fix python3 offline installs --- Makefile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 7578b5aa21..22b3f893f2 100644 --- a/Makefile +++ b/Makefile @@ -159,8 +159,11 @@ requirements_ansible: virtualenv_ansible $(VENV_BASE)/ansible/bin/pip uninstall --yes -r requirements/requirements_ansible_uninstall.txt requirements_ansible_py3: virtualenv_ansible_py3 - cat requirements/requirements_ansible.txt requirements/requirements_ansible_git.txt | $(VENV_BASE)/ansible/bin/pip3 install $(PIP_OPTIONS) --no-binary $(SRC_ONLY_PKGS) --ignore-installed -r /dev/stdin - $(VENV_BASE)/ansible/bin/pip3 install ansible # can't inherit from system ansible, it's py2 + if [[ "$(PIP_OPTIONS)" == *"--no-index"* ]]; then \ + cat requirements/requirements_ansible.txt requirements/requirements_ansible_local.txt | $(VENV_BASE)/ansible/bin/pip3 install $(PIP_OPTIONS) --ignore-installed -r /dev/stdin ; \ + else \ + cat requirements/requirements_ansible.txt requirements/requirements_ansible_git.txt | $(VENV_BASE)/ansible/bin/pip3 install $(PIP_OPTIONS) --no-binary $(SRC_ONLY_PKGS) --ignore-installed -r /dev/stdin ; \ + fi $(VENV_BASE)/ansible/bin/pip3 uninstall --yes -r requirements/requirements_ansible_uninstall.txt requirements_ansible_dev: -- cgit v1.2.3