diff options
| author | Shane McDonald <me@shanemcd.com> | 2019-03-22 17:10:47 +0100 |
|---|---|---|
| committer | Shane McDonald <me@shanemcd.com> | 2019-03-22 18:30:09 +0100 |
| commit | 0eaeadad8724ee3eefca81a5302e750101f24de9 (patch) | |
| tree | fc5125209c31645838e766a32a6fc87efc9a8d8a /Makefile | |
| parent | Merge pull request #3482 from chrismeyersfsu/fix-iso_ident (diff) | |
| download | awx-0eaeadad8724ee3eefca81a5302e750101f24de9.tar.xz awx-0eaeadad8724ee3eefca81a5302e750101f24de9.zip | |
Fix python3 offline installs
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 7 |
1 files changed, 5 insertions, 2 deletions
@@ -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: |