Skip to content

Commit 95fac9a

Browse files
committed
Fix scoping issues to allow for strict vars
1 parent 44ecb02 commit 95fac9a

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

manifests/requirements.pp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,8 @@
8080
$timeout = 1800,
8181
) {
8282

83+
include ::python
84+
8385
if $virtualenv == 'system' and ($owner != 'root' or $group != 'root') {
8486
fail('python::pip: root user must be used when virtualenv is system')
8587
}
@@ -98,8 +100,8 @@
98100
}
99101

100102
$pip_env = $virtualenv ? {
101-
'system' => "${python::exec_prefix} pip",
102-
default => "${python::exec_prefix} ${virtualenv}/bin/pip",
103+
'system' => "${::python::exec_prefix} pip",
104+
default => "${::python::exec_prefix} ${virtualenv}/bin/pip",
103105
}
104106

105107
$proxy_flag = $proxy ? {
@@ -136,5 +138,4 @@
136138
subscribe => File[$requirements],
137139
environment => $environment,
138140
}
139-
140141
}

0 commit comments

Comments
 (0)