summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJarl Stefansson <jarl@sdelements.com>2014-01-03 10:49:25 -0500
committerJarl Stefansson <jarl@sdelements.com>2014-01-03 10:49:25 -0500
commit7ae9495652889b69543c57869d181e4b479070b4 (patch)
treeefc43f0ac466f8ab03c30e82e31a3344139f23c7
parentd8a72b218455de66b59af0229ebae2e708538e77 (diff)
Fix grep for detecting if virtenv needs rebuild
-rw-r--r--manifests/virtualenv.pp4
1 files changed, 2 insertions, 2 deletions
diff --git a/manifests/virtualenv.pp b/manifests/virtualenv.pp
index f3ca1ce..cee35fc 100644
--- a/manifests/virtualenv.pp
+++ b/manifests/virtualenv.pp
@@ -119,7 +119,7 @@ define python::virtualenv (
default => "-i ${index}",
}
- # Python 2.6 and older does not support setuptools/distribute > 0.8 which
+ # Python 2.6 and older does not support setuptools/distribute > 0.8 which
# is required for pip wheel support, pip therefor requires --no-use-wheel flag
# if the # pip version is more recent than 1.4.1 but using an old python or
# setuputils/distribute version
@@ -132,7 +132,7 @@ define python::virtualenv (
path => $path,
cwd => "/tmp",
environment => $environment,
- unless => "grep '^[ \t]*VIRTUAL_ENV=[\'\"]*${venv_dir}[\"\']*[ \t]*$' ${venv_dir}/bin/activate", #Unless activate exists and VIRTUAL_ENV is correct we re-create the virtualenv
+ unless => "grep '^[\\t ]*VIRTUAL_ENV=[\\\\'\\\"]*${venv_dir}[\\\"\\\\'][\\t ]*$' ${venv_dir}/bin/activate", #Unless activate exists and VIRTUAL_ENV is correct we re-create the virtualenv
}
if $requirements {