Skip to content

Commit 8de9098

Browse files
committed
fixed python dev install when using scl
1 parent 0ba2ac9 commit 8de9098

File tree

1 file changed

+14
-7
lines changed

1 file changed

+14
-7
lines changed

manifests/install.pp

+14-7
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,6 @@
5050
name => $python,
5151
}
5252

53-
package { 'python-dev':
54-
ensure => $dev_ensure,
55-
name => $pythondev,
56-
}
57-
5853
package { 'pip':
5954
ensure => $pip_ensure,
6055
require => Package['python'],
@@ -67,6 +62,12 @@
6762

6863
case $python::provider {
6964
pip: {
65+
66+
package { 'python-dev':
67+
ensure => $dev_ensure,
68+
name => $pythondev,
69+
}
70+
7071
# Install pip without pip, see https://pip.pypa.io/en/stable/installing/.
7172
exec { 'bootstrap pip':
7273
command => '/usr/bin/curl https://bootstrap.pypa.io/get-pip.py | python',
@@ -116,7 +117,7 @@
116117
# ensure => $venv_ensure,
117118
# require => Package['scl-utils'],
118119
# }
119-
package { "${python::version}-scldev":
120+
package { "${python}-scldevel":
120121
ensure => $dev_ensure,
121122
require => Package['scl-utils'],
122123
}
@@ -142,7 +143,7 @@
142143
tag => 'python-scl-package',
143144
}
144145

145-
package { "${python::version}-scldev":
146+
package { "${python}-scldevel":
146147
ensure => $dev_ensure,
147148
tag => 'python-scl-package',
148149
}
@@ -161,6 +162,12 @@
161162
}
162163

163164
default: {
165+
166+
package { 'python-dev':
167+
ensure => $dev_ensure,
168+
name => $pythondev,
169+
}
170+
164171
if $::osfamily == 'RedHat' {
165172
if $pip_ensure != 'absent' {
166173
if $python::use_epel == true {

0 commit comments

Comments
 (0)