diff options
| author | Sergey Stankevich <stankevich@users.noreply.github.com> | 2014-07-17 10:05:19 -0400 |
|---|---|---|
| committer | Sergey Stankevich <stankevich@users.noreply.github.com> | 2014-07-17 10:05:19 -0400 |
| commit | 98c09ecc7ec646a74e1c06d86d5c7d606c13508d (patch) | |
| tree | 5f0ecbeafc495b8669967b21a8ea13e54a381122 | |
| parent | 83f42940563d183593b0e091c314dbf1484fae1e (diff) | |
| parent | 71a649190bafe3ff114e6eee3655bfbcb24bb22e (diff) | |
Merge pull request #92 from tremblaysimon/fixpipwheel
Fixed pip wheel
| -rw-r--r-- | .gitignore | 4 | ||||
| -rw-r--r-- | manifests/pip.pp | 6 |
2 files changed, 7 insertions, 3 deletions
@@ -3,3 +3,7 @@ pkg/ # ignore rbvenv files used for puppet-lint, rspect etc. .ruby-version .rbenv-gemsets + +# ignore geppetto files +.project +metadata.json diff --git a/manifests/pip.pp b/manifests/pip.pp index 2cb5bd5..247295c 100644 --- a/manifests/pip.pp +++ b/manifests/pip.pp @@ -149,7 +149,7 @@ define python::pip ( # Version formats as per http://guide.python-distribute.org/specification.html#standard-versioning-schemes # Explicit version. exec { "pip_install_${name}": - command => "${pip_env} wheel --help > /dev/null 2>&1 && { ${pip_env} wheel --version > /dev/null 2>&1 || wheel_support_flag='--no-use-wheel'; } ; ${pip_env} --log ${cwd}/pip.log install ${install_args} \$wheel_support_flag ${proxy_flag} ${install_args} ${install_editable} ${source}==${ensure}", + command => "${pip_env} wheel --help > /dev/null 2>&1 && { ${pip_env} wheel --version > /dev/null 2>&1 || wheel_support_flag='--no-use-wheel'; } ; { ${pip_env} --log ${cwd}/pip.log install ${install_args} \$wheel_support_flag ${proxy_flag} ${install_args} ${install_editable} ${source}==${ensure} || ${pip_env} --log ${cwd}/pip.log install ${install_args} ${proxy_flag} ${install_args} ${install_editable} ${source}==${ensure} ;}", unless => "${pip_env} freeze | grep -i -e ${grep_regex}", user => $owner, environment => $environment, @@ -161,7 +161,7 @@ define python::pip ( present: { # Whatever version is available. exec { "pip_install_${name}": - command => "${pip_env} wheel --help > /dev/null 2>&1 && { ${pip_env} wheel --version > /dev/null 2>&1 || wheel_support_flag='--no-use-wheel'; } ; ${pip_env} --log ${cwd}/pip.log install \$wheel_support_flag ${proxy_flag} ${install_args} ${install_editable} ${source}", + command => "${pip_env} wheel --help > /dev/null 2>&1 && { ${pip_env} wheel --version > /dev/null 2>&1 || wheel_support_flag='--no-use-wheel'; } ; { ${pip_env} --log ${cwd}/pip.log install \$wheel_support_flag ${proxy_flag} ${install_args} ${install_editable} ${source} || ${pip_env} --log ${cwd}/pip.log install ${proxy_flag} ${install_args} ${install_editable} ${source} ;}", unless => "${pip_env} freeze | grep -i -e ${grep_regex}", user => $owner, environment => $environment, @@ -173,7 +173,7 @@ define python::pip ( latest: { # Latest version. exec { "pip_install_${name}": - command => "${pip_env} wheel --help > /dev/null 2>&1 && { ${pip_env} wheel --version > /dev/null 2>&1 || wheel_support_flag='--no-use-wheel'; } ; ${pip_env} --log ${cwd}/pip.log install --upgrade \$wheel_support_flag ${proxy_flag} ${uninstall_args} ${install_editable} ${source}", + command => "${pip_env} wheel --help > /dev/null 2>&1 && { ${pip_env} wheel --version > /dev/null 2>&1 || wheel_support_flag='--no-use-wheel'; } ; { ${pip_env} --log ${cwd}/pip.log install --upgrade \$wheel_support_flag ${proxy_flag} ${uninstall_args} ${install_editable} ${source} || ${pip_env} --log ${cwd}/pip.log install --upgrade ${proxy_flag} ${uninstall_args} ${install_editable} ${source} ;}", unless => "${pip_env} search ${source} | grep -i INSTALLED | grep -i latest", user => $owner, environment => $environment, |