From 2f4cbc0969fcb875727a510dd819c03bada3903e Mon Sep 17 00:00:00 2001
From: Nate Coraor <nate@bx.psu.edu>
Date: Wed, 28 Oct 2015 17:58:33 -0400
Subject: [PATCH] virtualenv_command is still required if `virtualenv` isn't on
 $PATH, even if the venv already exists.

---
 tasks/dependencies.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/tasks/dependencies.yml b/tasks/dependencies.yml
index bd9f14f..f21986b 100644
--- a/tasks/dependencies.yml
+++ b/tasks/dependencies.yml
@@ -15,12 +15,15 @@
   register: fetch_eggs_result
   changed_when: (fetch_eggs_result.rc == 0) and (fetch_eggs_result.stdout != "")
 
+# virtualenv_command is still required if `virtualenv` isn't on $PATH, even if
+# the venv already exists.
 - name: Install Galaxy pip
   pip:
     name: pip
     state: latest
     extra_args: "--pre --no-index --find-links https://wheels.galaxyproject.org/simple/pip"
     virtualenv: "{{ galaxy_venv_dir }}"
+    virtualenv_command: "{{ pip_virtualenv_command | default( 'virtualenv' ) }}"
   environment:
     PYTHONPATH: null
     VIRTUAL_ENV: "{{ galaxy_venv_dir }}"
@@ -40,6 +43,7 @@
     requirements: "{{ galaxy_server_dir }}/lib/galaxy/dependencies/requirements.txt"
     extra_args: "--index-url https://wheels.galaxyproject.org/simple/"
     virtualenv: "{{ galaxy_venv_dir }}"
+    virtualenv_command: "{{ pip_virtualenv_command | default( 'virtualenv' ) }}"
   environment:
     PYTHONPATH: null
     VIRTUAL_ENV: "{{ galaxy_venv_dir }}"
@@ -57,6 +61,7 @@
     name: "{{ item }}"
     extra_args: "--index-url https://wheels.galaxyproject.org/simple/"
     virtualenv: "{{ galaxy_venv_dir }}"
+    virtualenv_command: "{{ pip_virtualenv_command | default( 'virtualenv' ) }}"
   with_items: conditional_dependencies.stdout_lines
   environment:
     PYTHONPATH: null