From 1087abd3ba21bcb5b33f7c40f07724c1b9a093eb Mon Sep 17 00:00:00 2001
From: Jarl Stefansson <jarl@sdelements.com>
Date: Fri, 3 Jan 2014 09:34:04 -0500
Subject: Further fixes for pip 1.5 and wheel handling

---
 manifests/pip.pp        | 6 +++---
 manifests/virtualenv.pp | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'manifests')

diff --git a/manifests/pip.pp b/manifests/pip.pp
index 5c218c5..e9ab7cd 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 > /dev/null 2>&1 && { pip 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} ${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 > /dev/null 2>&1&& { pip 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} ${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 > /dev/null 2>&1&& { pip wheel --version > /dev/null 2>&1 || 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,
       }
diff --git a/manifests/virtualenv.pp b/manifests/virtualenv.pp
index 9c9502d..7a548a6 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 && (${venv_dir}/bin/pip wheel --version || 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 $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}",
       user    => $owner,
       path    => $path,
       cwd     => "/tmp",
-- 
cgit v1.2.3