diff options
| author | Sergey Stankevich <stankevich@users.noreply.github.com> | 2014-01-27 11:27:15 -0800 |
|---|---|---|
| committer | Sergey Stankevich <stankevich@users.noreply.github.com> | 2014-01-27 11:27:15 -0800 |
| commit | 9c48fb3c0df9ff8044fe384efb8c97cf85b5d72c (patch) | |
| tree | 7a3e08edf9e475846ebd486f363e5961d20712e0 /manifests/virtualenv.pp | |
| parent | 28c08f47ec6fce17f9f3e80385ed7e517fb1661b (diff) | |
| parent | 0671d69354bb4ddd65159a516dc38c32b05c5e05 (diff) | |
Merge pull request #57 from jalli/master
Fix pip wheel handling when wheels are supported but --no-use-wheel flag is not
Diffstat (limited to 'manifests/virtualenv.pp')
| -rw-r--r-- | manifests/virtualenv.pp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/manifests/virtualenv.pp b/manifests/virtualenv.pp index a7a2bcb..b9cd689 100644 --- a/manifests/virtualenv.pp +++ b/manifests/virtualenv.pp @@ -127,7 +127,7 @@ define python::virtualenv ( # version, this makes sure we only use wheels if they are supported exec { "python_virtualenv_${venv_dir}": - command => "mkdir -p ${venv_dir} ${proxy_command} && virtualenv ${system_pkgs_flag} -p ${python} ${venv_dir} && ${venv_dir}/bin/pip wheel --help > /dev/null 2>&1 && { ${venv_dir}/bin/pip wheel --version > /dev/null 2>&1 || wheel_support_flag='--no-use-wheel'; } ; ${venv_dir}/bin/pip --log ${venv_dir}/pip.log install ${pypi_index} ${proxy_flag} \$wheel_support_flag --upgrade pip ${distribute_pkg}", + command => "mkdir -p ${venv_dir} ${proxy_command} && virtualenv ${system_pkgs_flag} -p ${python} ${venv_dir} && ${venv_dir}/bin/pip wheel --help > /dev/null 2>&1 && { ${venv_dir}/bin/pip wheel --version > /dev/null 2>&1 || wheel_support_flag='--no-use-wheel'; } ; { ${venv_dir}/bin/pip --log ${venv_dir}/pip.log install ${pypi_index} ${proxy_flag} \$wheel_support_flag --upgrade pip ${distribute_pkg} || ${venv_dir}/bin/pip --log ${venv_dir}/pip.log install ${pypi_index} ${proxy_flag} --upgrade pip ${distribute_pkg} ;}", user => $owner, path => $path, cwd => "/tmp", |