summaryrefslogtreecommitdiff
path: root/manifests/pip.pp
diff options
context:
space:
mode:
authorJarl Stefansson <jarl@sdelements.com>2014-01-02 16:14:57 -0500
committerJarl Stefansson <jarl@sdelements.com>2014-01-02 16:14:57 -0500
commitf2266d7070a3c6f1a07b7746448c647e3bc37b88 (patch)
treeeaf7ff995243602c2bc4e604ca326ce24548c6ed /manifests/pip.pp
parent44acbef424819e226bec875aabf3db44a06b7015 (diff)
Fix bash logic false positives
Diffstat (limited to 'manifests/pip.pp')
-rw-r--r--manifests/pip.pp6
1 files changed, 3 insertions, 3 deletions
diff --git a/manifests/pip.pp b/manifests/pip.pp
index 5e287f7..5c218c5 100644
--- a/manifests/pip.pp
+++ b/manifests/pip.pp
@@ -96,7 +96,7 @@ define python::pip (
case $ensure {
present: {
exec { "pip_install_${name}":
- command => "$pip_env wheel --help && pip wheel --version || wheel_support_flag='--no-use-wheel'; $pip_env --log ${cwd}/pip.log install $install_args \$wheel_support_flag ${proxy_flag} ${source}",
+ command => "$pip_env wheel --help && (pip wheel --version || wheel_support_flag='--no-use-wheel'); $pip_env --log ${cwd}/pip.log install $install_args \$wheel_support_flag ${proxy_flag} ${source}",
unless => "$pip_env freeze | grep -i -e ${grep_regex}",
user => $owner,
environment => $environment,
@@ -106,7 +106,7 @@ define python::pip (
latest: {
exec { "pip_install_${name}":
- command => "$pip_env wheel --help && pip wheel --version || wheel_support_flag='--no-use-wheel'; $pip_env --log ${cwd}/pip.log install --upgrade \$wheel_support_flag ${proxy_flag} ${source}",
+ command => "$pip_env wheel --help && (pip wheel --version || wheel_support_flag='--no-use-wheel'); $pip_env --log ${cwd}/pip.log install --upgrade \$wheel_support_flag ${proxy_flag} ${source}",
user => $owner,
environment => $environment,
path => ["/usr/local/bin","/usr/bin","/bin", "/usr/sbin"],
@@ -115,7 +115,7 @@ define python::pip (
latest: {
exec { "pip_install_${name}":
- command => "$pip_env wheel --help && pip wheel --version || wheel_support_flag='--no-use-wheel'; $pip_env --log ${cwd}/pip.log install -U $install_args \$wheel_support_flag ${proxy_flag} ${source}",
+ command => "$pip_env wheel --help && (pip wheel --version || wheel_support_flag='--no-use-wheel'); $pip_env --log ${cwd}/pip.log install -U $install_args \$wheel_support_flag ${proxy_flag} ${source}",
user => $owner,
environment => $environment,
}