Merge pull request voxpupuli#9 from zoni/pipcwd

stankevich · stankevich · commit c1a73e2a57b9 · 2013-04-23T12:22:35.000-07:00
Fix regression with $cwd in python::requirements
diff --git a/manifests/requirements.pp b/manifests/requirements.pp
@@ -33,7 +33,7 @@
 
   $cwd = $virtualenv ? {
     'system' => '/',
-    default  => "${virtualenv}/bin/pip",
+    default  => "${virtualenv}/bin/",
   }
 
   $pip_env = $virtualenv ? {
@@ -48,10 +48,10 @@
 
   $req_crc = "${requirements}.sha1"
 
-   # This will ensure multiple python::virtualenv definitions can share the
-   # the same requirements file.
-   if !defined(File[$requirements]) {
-  file { $requirements:
+  # This will ensure multiple python::virtualenv definitions can share the
+  # the same requirements file.
+  if !defined(File[$requirements]) {
+    file { $requirements:
       ensure  => present,
       mode    => '0644',
       owner   => 'root',
