From cfcc3781d49239834d7bb91e7c2ec3c08c982a13 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 14 Jan 2014 15:25:38 +0100
Subject: Wheel support in pip needs current setuptools

When virtualenvs are used without distribute and an old setuptools
python package is installed in the system, upgrading pip in the
virtualenv won't ensure setuptools > 0.8 is installed which is required
by the pip wheel command. This patch upgrades setuptools if distribute
isn't used.

Signed-off-by: Franz Pletz <fpletz@fnordicwalking.de>
---
 manifests/virtualenv.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'manifests')

diff --git a/manifests/virtualenv.pp b/manifests/virtualenv.pp
index fc540a8..a7a2bcb 100644
--- a/manifests/virtualenv.pp
+++ b/manifests/virtualenv.pp
@@ -112,7 +112,7 @@ define python::virtualenv (
 
     $distribute_pkg = $distribute ? {
       true     => 'distribute',
-      default  => '',
+      default  => 'setuptools',
     }
     $pypi_index = $index ? {
         false   => '',
-- 
cgit v1.2.3


From 4a0ad14203420a9d05db336bd48940dcd61876a6 Mon Sep 17 00:00:00 2001
From: Steffen Zieger <me@saz.sh>
Date: Thu, 16 Jan 2014 01:17:34 +0100
Subject: Add path to requirements exec

---
 manifests/requirements.pp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'manifests')

diff --git a/manifests/requirements.pp b/manifests/requirements.pp
index 5fa6eb9..11c5f00 100644
--- a/manifests/requirements.pp
+++ b/manifests/requirements.pp
@@ -102,6 +102,7 @@ define python::requirements (
     user        => $owner,
     subscribe   => File[$requirements],
     environment => $environment,
+    path        => ['/usr/local/bin','/usr/bin','/bin', '/usr/sbin'],
   }
 
 }
-- 
cgit v1.2.3


From dba29a61bda4ab44ec8c42a43583d0e51f3806d9 Mon Sep 17 00:00:00 2001
From: Steffen Zieger <me@saz.sh>
Date: Thu, 16 Jan 2014 01:19:41 +0100
Subject: remove duplicate pip_install exec for latest case

---
 manifests/pip.pp | 8 --------
 1 file changed, 8 deletions(-)

(limited to 'manifests')

diff --git a/manifests/pip.pp b/manifests/pip.pp
index fb73ae7..4aacb31 100644
--- a/manifests/pip.pp
+++ b/manifests/pip.pp
@@ -112,14 +112,6 @@ define python::pip (
       }
     }
 
-    latest: {
-      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 -U ${install_args} \$wheel_support_flag ${proxy_flag} ${source}",
-        user        => $owner,
-        environment => $environment,
-      }
-    }
-
     default: {
       exec { "pip_uninstall_${name}":
         command     => "echo y | ${pip_env} uninstall ${uninstall_args} ${proxy_flag} ${name}",
-- 
cgit v1.2.3