diff options
| author | Sergey Stankevich <sergey@stankevi.ch> | 2013-04-23 12:22:35 -0700 |
|---|---|---|
| committer | Sergey Stankevich <sergey@stankevi.ch> | 2013-04-23 12:22:35 -0700 |
| commit | c1a73e2a57b9177ce8781cb6eb846505e0af8bed (patch) | |
| tree | 73a3d132eca50acf5689d22a80e856519e419072 | |
| parent | 4d8d040186d45556f5ba37ba311c0ec06e94499b (diff) | |
| parent | 156499f5938078b5ab3ec2170f00cd2500f64df1 (diff) | |
Merge pull request #9 from zoni/pipcwd
Fix regression with $cwd in python::requirements
| -rw-r--r-- | manifests/requirements.pp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/manifests/requirements.pp b/manifests/requirements.pp index cae32bf..0559632 100644 --- a/manifests/requirements.pp +++ b/manifests/requirements.pp @@ -33,7 +33,7 @@ define python::requirements ( $cwd = $virtualenv ? { 'system' => '/', - default => "${virtualenv}/bin/pip", + default => "${virtualenv}/bin/", } $pip_env = $virtualenv ? { @@ -48,10 +48,10 @@ define python::requirements ( $req_crc = "${requirements}.sha1" - # This will ensure multiple python::virtualenv definitions can share the - # the same requirements file. - if !defined(File[$requirements]) { - file { $requirements: + # This will ensure multiple python::virtualenv definitions can share the + # the same requirements file. + if !defined(File[$requirements]) { + file { $requirements: ensure => present, mode => '0644', owner => 'root', |