diff options
| author | Jarl Stefansson <jarl@sdelements.com> | 2014-01-03 11:33:12 -0500 |
|---|---|---|
| committer | Jarl Stefansson <jarl@sdelements.com> | 2014-01-03 11:33:12 -0500 |
| commit | ce3562f32bdf37d78228c22038a6b9d13f073c54 (patch) | |
| tree | d2b6125f12df90d892a4fc19c9f04710bd6e98f4 /manifests/virtualenv.pp | |
| parent | 895eebf2a03a29959d0c4dbd613cfa345ac22b55 (diff) | |
| parent | 2bab9c9a03cd01450877d897399c68f37fea0ff7 (diff) | |
Merge branch 'master' of https://github.com/stankevich/puppet-python
Conflicts:
manifests/pip.pp
manifests/virtualenv.pp
Merge curly braces around variable names
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 cee35fc..a779141 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 $pip_env 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}", user => $owner, path => $path, cwd => "/tmp", |