summaryrefslogtreecommitdiff
path: root/manifests/virtualenv.pp
diff options
context:
space:
mode:
authorNeil Saunders <neil@zeebox.com>2013-12-19 18:06:25 +0000
committerNeil Saunders <neil@zeebox.com>2013-12-19 18:06:25 +0000
commit535115b9d1426a4d380dc4631fdd2944e0c29e88 (patch)
treee7a42f69966ba12c7bf0f4e0ff633f8399718bfd /manifests/virtualenv.pp
parentc2a96f8dd40d75c6cf15518010e0a00889df6690 (diff)
Fixing lint issues as per http://docs.puppetlabs.com/guides/style_guide.html
Diffstat (limited to 'manifests/virtualenv.pp')
-rw-r--r--manifests/virtualenv.pp12
1 files changed, 6 insertions, 6 deletions
diff --git a/manifests/virtualenv.pp b/manifests/virtualenv.pp
index bc7141c..85fc67a 100644
--- a/manifests/virtualenv.pp
+++ b/manifests/virtualenv.pp
@@ -98,7 +98,7 @@ define python::virtualenv (
default => "&& export http_proxy=${proxy}",
}
- # Virtualenv versions prior to 1.7 do not support the
+ # Virtualenv versions prior to 1.7 do not support the
# --system-site-packages flag, default off for prior versions
# Prior to version 1.7 the default was equal to --system-site-packages
# and the flag --no-site-packages had to be passed to do the opposite
@@ -120,12 +120,12 @@ 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 ${venv_dir}/pip.log install ${pypi_index} ${proxy_flag} --upgrade pip ${distribute_pkg}",
- user => $owner,
- path => $path,
- cwd => "/tmp",
+ 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',
environment => $environment,
- unless => "grep '^[ \t]*VIRTUAL_ENV=[\'\"]*/tmp[\"\']*[ \t]*$' /tmp/bin/activate", #Unless activate exists and VIRTUAL_ENV is correct we re-create the virtualenv
+ unless => "grep '^[ \t]*VIRTUAL_ENV=[\'\"]*/tmp[\"\']*[ \t]*$' /tmp/bin/activate", #Unless activate exists and VIRTUAL_ENV is correct we re-create the virtualenv
}
if $requirements {