From 8de9098ee0041a033215432912565016d4a63770 Mon Sep 17 00:00:00 2001 From: Ernesto Ruy Sanchez Date: Fri, 4 Dec 2015 16:59:07 -0800 Subject: [PATCH] fixed python dev install when using scl --- manifests/install.pp | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/manifests/install.pp b/manifests/install.pp index c26b40a1..44782fd4 100644 --- a/manifests/install.pp +++ b/manifests/install.pp @@ -50,11 +50,6 @@ name => $python, } - package { 'python-dev': - ensure => $dev_ensure, - name => $pythondev, - } - package { 'pip': ensure => $pip_ensure, require => Package['python'], @@ -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', @@ -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'], } @@ -142,7 +143,7 @@ tag => 'python-scl-package', } - package { "${python::version}-scldev": + package { "${python}-scldevel": ensure => $dev_ensure, tag => 'python-scl-package', } @@ -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 {