From 5132cf1798d862e28f9c9355a2e01a96f585f28f Mon Sep 17 00:00:00 2001
From: Fotis Gimian <fgimiansoftware@gmail.com>
Date: Mon, 3 Jun 2013 23:29:44 +1000
Subject: Removed owner attribute from the pip class as it was not needed and
 touched up a few mistakes.

---
 manifests/pip.pp        | 15 +++++++--------
 manifests/virtualenv.pp |  2 +-
 2 files changed, 8 insertions(+), 9 deletions(-)

(limited to 'manifests')

diff --git a/manifests/pip.pp b/manifests/pip.pp
index 0693057..3940374 100644
--- a/manifests/pip.pp
+++ b/manifests/pip.pp
@@ -28,13 +28,12 @@
 # Sergey Stankevich
 #
 define python::pip (
-  $virtualenv = 'system',
-  $ensure     = present,
-  $url        = false,
-  $owner      = 'root',
-  $group      = 'root',
-  $proxy      = false,
-  environment = []
+  $ensure      = present,
+  $virtualenv  = 'system',
+  $url         = false,
+  $owner       = 'root',
+  $proxy       = false,
+  $environment = []
 ) {
 
   # Parameter validation
@@ -42,7 +41,7 @@ define python::pip (
     fail('python::pip: virtualenv parameter must not be empty')
   }
 
-  if $virtualenv == 'system' and ($owner != 'root' or $group != 'root') {
+  if $virtualenv == 'system' and $owner != 'root' {
     fail('python::pip: root user must be used when virtualenv is system')
   }
 
diff --git a/manifests/virtualenv.pp b/manifests/virtualenv.pp
index 53f30f8..684a417 100644
--- a/manifests/virtualenv.pp
+++ b/manifests/virtualenv.pp
@@ -93,7 +93,7 @@ define python::virtualenv (
 
     if $requirements {
       exec { "python_requirements_initial_install_${requirements}_${venv_dir}":
-        command     => "${venv_dir}/bin/pip --log-file ${venv_dir}/pip.log install ${pypi_index} ${proxy_flag} --requirement ${requirements}",
+        command     => "${venv_dir}/bin/pip --log-file ${venv_dir}/pip.log install ${pypi_index} ${proxy_flag} -r ${requirements}",
         refreshonly => true,
         timeout     => 1800,
         user        => $owner,
-- 
cgit v1.2.3