From 8b22e3ecd90dd3ac741ff107d6f3fc8c511443ba Mon Sep 17 00:00:00 2001
From: Salimane Adjao Moustapha <me@salimane.com>
Date: Fri, 19 Apr 2013 18:11:14 +0800
Subject: fix python::requirements Error: Parameter cwd failed on Exec and
 command not found

---
 manifests/requirements.pp | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'manifests')

diff --git a/manifests/requirements.pp b/manifests/requirements.pp
index 22988e5..cae32bf 100644
--- a/manifests/requirements.pp
+++ b/manifests/requirements.pp
@@ -31,6 +31,11 @@ define python::requirements (
   $proxy        = false
 ) {
 
+  $cwd = $virtualenv ? {
+    'system' => '/',
+    default  => "${virtualenv}/bin/pip",
+  }
+
   $pip_env = $virtualenv ? {
     'system' => '`which pip`',
     default  => "${virtualenv}/bin/pip",
@@ -46,7 +51,7 @@ define python::requirements (
    # This will ensure multiple python::virtualenv definitions can share the
    # the same requirements file.
    if !defined(File[$requirements]) {
-	file { $requirements:
+  file { $requirements:
       ensure  => present,
       mode    => '0644',
       owner   => 'root',
@@ -64,8 +69,9 @@ define python::requirements (
   }
 
   exec { "python_requirements_update_${name}":
+    provider    => shell,
     command     => "${pip_env} install ${proxy_flag} -Ur ${requirements}",
-    cwd         => $virtualenv,
+    cwd         => $cwd,
     refreshonly => true,
     timeout     => 1800,
     subscribe   => Exec["python_requirements_check_${name}"],
-- 
cgit v1.2.3