Merge pull request voxpupuli#8 from salimane/pr_python_requirements_cwd

stankevich · stankevich · commit 4d8d040186d4 · 2013-04-19T05:52:13.000-07:00
python::requirements Error: Parameter cwd failed on Exec for virtualenv=system
diff --git a/manifests/requirements.pp b/manifests/requirements.pp
@@ -31,6 +31,11 @@
   $proxy        = false
 ) {
 
+  $cwd = $virtualenv ? {
+    'system' => '/',
+    default  => "${virtualenv}/bin/pip",
+  }
+
   $pip_env = $virtualenv ? {
     'system' => '`which pip`',
     default  => "${virtualenv}/bin/pip",
@@ -46,7 +51,7 @@
    # 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 @@
   }
 
   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}"],
diff --git a/tests/requirements.pp b/tests/requirements.pp
@@ -8,3 +8,8 @@
   virtualenv => '/var/www/project1',
   proxy      => 'http://proxy.domain.com:3128',
 }
+
+python::requirements { '/var/www/project1/requirements.txt':
+  virtualenv => 'system',
+  proxy      => 'http://proxy.domain.com:3128',
+}

Original file line number	Diff line number	Diff line change
`@@ -8,3 +8,8 @@`
`8`	`8`	`virtualenv => '/var/www/project1',`
`9`	`9`	`proxy => 'http://proxy.domain.com:3128',`
`10`	`10`	`}`
	`11`	`+`
	`12`	`+python::requirements { '/var/www/project1/requirements.txt':`
	`13`	`+ virtualenv => 'system',`
	`14`	`+ proxy => 'http://proxy.domain.com:3128',`
	`15`	`+}`