From 607b527a11657ddd24545ebc33f0c0984d4c0093 Mon Sep 17 00:00:00 2001
From: Jarl Stefansson <jarl@sdelements.com>
Date: Tue, 17 Dec 2013 16:05:05 -0500
Subject: Pip needs log argument not log-file.

---
 manifests/requirements.pp | 2 +-
 manifests/virtualenv.pp   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'manifests')

diff --git a/manifests/requirements.pp b/manifests/requirements.pp
index 60c5b6c..ee44fa4 100644
--- a/manifests/requirements.pp
+++ b/manifests/requirements.pp
@@ -90,7 +90,7 @@ define python::requirements (
 
   exec { "python_requirements${name}":
     provider    => shell,
-    command     => "${pip_env} --log-file ${cwd}/pip.log install ${proxy_flag} ${src_flag} -r ${requirements}",
+    command     => "${pip_env} --log ${cwd}/pip.log install ${proxy_flag} ${src_flag} -r ${requirements}",
     refreshonly => true,
     timeout     => 1800,
     user        => $owner,
diff --git a/manifests/virtualenv.pp b/manifests/virtualenv.pp
index d8e3915..bc7141c 100644
--- a/manifests/virtualenv.pp
+++ b/manifests/virtualenv.pp
@@ -120,7 +120,7 @@ define python::virtualenv (
     }
 
     exec { "python_virtualenv_${venv_dir}":
-      command => "mkdir -p ${venv_dir} ${proxy_command} && virtualenv ${system_pkgs_flag} -p ${python} ${venv_dir} && ${venv_dir}/bin/pip --log-file ${venv_dir}/pip.log install ${pypi_index} ${proxy_flag} --upgrade pip ${distribute_pkg}",
+      command => "mkdir -p ${venv_dir} ${proxy_command} && virtualenv ${system_pkgs_flag} -p ${python} ${venv_dir} && ${venv_dir}/bin/pip --log ${venv_dir}/pip.log install ${pypi_index} ${proxy_flag} --upgrade pip ${distribute_pkg}",
       user    => $owner,
       path    => $path,
       cwd     => "/tmp",
@@ -130,7 +130,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} -r ${requirements}",
+        command     => "${venv_dir}/bin/pip --log ${venv_dir}/pip.log install ${pypi_index} ${proxy_flag} -r ${requirements}",
         refreshonly => true,
         timeout     => $timeout,
         user        => $owner,
-- 
cgit v1.2.3