summaryrefslogtreecommitdiff
path: root/manifests/virtualenv.pp
diff options
context:
space:
mode:
authorFotis Gimian <fgimiansoftware@gmail.com>2013-06-03 23:13:50 +1000
committerFotis Gimian <fgimiansoftware@gmail.com>2013-06-03 23:13:50 +1000
commit1aaef848f4a52d83a6b44eeb4cffd9b61a665c41 (patch)
treee064a68f8ddcdbad835dc1f561cd74fa4e832300 /manifests/virtualenv.pp
parentf6fd9f46fe9c058d1f0877043d42829efe0c45cb (diff)
Made system virtualenv more robust and ensured that pip logging would occur in an appropriate directory upon failure to avoid errors
Diffstat (limited to 'manifests/virtualenv.pp')
-rw-r--r--manifests/virtualenv.pp4
1 files changed, 2 insertions, 2 deletions
diff --git a/manifests/virtualenv.pp b/manifests/virtualenv.pp
index 5946e15..53f30f8 100644
--- a/manifests/virtualenv.pp
+++ b/manifests/virtualenv.pp
@@ -85,7 +85,7 @@ define python::virtualenv (
}
exec { "python_virtualenv_${venv_dir}":
- command => "mkdir -p ${venv_dir} ${proxy_command} && virtualenv -p `which ${python}` ${system_pkgs_flag} ${venv_dir} && ${venv_dir}/bin/pip install ${pypi_index} ${proxy_flag} --upgrade ${distribute_pkg} pip",
+ command => "mkdir -p ${venv_dir} ${proxy_command} && virtualenv -p `which ${python}` ${system_pkgs_flag} ${venv_dir} && ${venv_dir}/bin/pip --log-file ${venv_dir}/pip.log install ${pypi_index} ${proxy_flag} --upgrade ${distribute_pkg} pip",
user => $owner,
creates => "${venv_dir}/bin/activate",
path => [ '/bin', '/usr/bin', '/usr/sbin' ],
@@ -93,7 +93,7 @@ define python::virtualenv (
if $requirements {
exec { "python_requirements_initial_install_${requirements}_${venv_dir}":
- command => "${venv_dir}/bin/pip install ${pypi_index} ${proxy_flag} --requirement ${requirements}",
+ command => "${venv_dir}/bin/pip --log-file ${venv_dir}/pip.log install ${pypi_index} ${proxy_flag} --requirement ${requirements}",
refreshonly => true,
timeout => 1800,
user => $owner,