Fix testing for existing virtual environment

Jarl Stefansson · Jarl Stefansson · commit d8a72b218455 · 2014-01-03T10:09:56.000-05:00
diff --git a/manifests/virtualenv.pp b/manifests/virtualenv.pp
@@ -132,7 +132,7 @@
       path    => $path,
       cwd     => "/tmp",
       environment => $environment,
-      unless => "grep '^[ \t]*VIRTUAL_ENV=[\'\"]*/tmp[\"\']*[ \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 {

Original file line number	Diff line number	Diff line change
`@@ -132,7 +132,7 @@`
`132`	`132`	`path => $path,`
`133`	`133`	`cwd => "/tmp",`
`134`	`134`	`environment => $environment,`
`135`		`- unless => "grep '^[ \t]VIRTUAL_ENV=[\'\"]/tmp[\"\'][ \t]$' ${venv_dir}/bin/activate", #Unless activate exists and VIRTUAL_ENV is correct we re-create the virtualenv`
	`135`	`+ 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`
`136`	`136`	`}`
`137`	`137`
`138`	`138`	`if $requirements {`