Skip to content

Commit

Permalink
Merge pull request voxpupuli#269 from netors/master
Browse files Browse the repository at this point in the history
fixed python dev install when using scl
  • Loading branch information
Shiva Poudel committed Dec 5, 2015
2 parents 0ba2ac9 + 8de9098 commit 2b6a8b7
Showing 1 changed file with 14 additions and 7 deletions.
21 changes: 14 additions & 7 deletions manifests/install.pp
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,6 @@
name => $python,
}

package { 'python-dev':
ensure => $dev_ensure,
name => $pythondev,
}

package { 'pip':
ensure => $pip_ensure,
require => Package['python'],
Expand All @@ -67,6 +62,12 @@

case $python::provider {
pip: {

package { 'python-dev':
ensure => $dev_ensure,
name => $pythondev,
}

# Install pip without pip, see https://pip.pypa.io/en/stable/installing/.
exec { 'bootstrap pip':
command => '/usr/bin/curl https://bootstrap.pypa.io/get-pip.py | python',
Expand Down Expand Up @@ -116,7 +117,7 @@
# ensure => $venv_ensure,
# require => Package['scl-utils'],
# }
package { "${python::version}-scldev":
package { "${python}-scldevel":
ensure => $dev_ensure,
require => Package['scl-utils'],
}
Expand All @@ -142,7 +143,7 @@
tag => 'python-scl-package',
}

package { "${python::version}-scldev":
package { "${python}-scldevel":
ensure => $dev_ensure,
tag => 'python-scl-package',
}
Expand All @@ -161,6 +162,12 @@
}

default: {

package { 'python-dev':
ensure => $dev_ensure,
name => $pythondev,
}

if $::osfamily == 'RedHat' {
if $pip_ensure != 'absent' {
if $python::use_epel == true {
Expand Down

0 comments on commit 2b6a8b7

Please sign in to comment.