Skip to content

Commit

Permalink
bugfix install pip on centos6 using scl
Browse files Browse the repository at this point in the history
  • Loading branch information
netors committed Dec 6, 2015
1 parent 8de9098 commit 7057d4a
Showing 1 changed file with 12 additions and 7 deletions.
19 changes: 12 additions & 7 deletions manifests/install.pp
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
$python = $::python::version ? {
'system' => 'python',
'pypy' => 'pypy',
default => "python${python::version}",
default => "${python::version}",

This comment has been minimized.

Copy link
@dansajner

dansajner Jan 7, 2016

Was this change intentional? It doesn't seem related to the bug fix and is a breaking change.

This comment has been minimized.

Copy link
@adamcstephens

adamcstephens Jan 19, 2016

Contributor

We should add this back in a PR. I ran into it as well.

}

$pythondev = $::osfamily ? {
Expand Down Expand Up @@ -50,11 +50,6 @@
name => $python,
}

package { 'pip':
ensure => $pip_ensure,
require => Package['python'],
}

package { 'virtualenv':
ensure => $venv_ensure,
require => Package['python'],
Expand All @@ -63,6 +58,11 @@
case $python::provider {
pip: {

package { 'pip':
ensure => $pip_ensure,
require => Package['python'],
}

package { 'python-dev':
ensure => $dev_ensure,
name => $pythondev,
Expand Down Expand Up @@ -123,7 +123,7 @@
}
if $pip_ensure != 'absent' {
exec { 'python-scl-pip-install':
command => "${python::params::exec_prefix}easy_install pip",
command => "${python::exec_prefix}easy_install pip",
path => ['/usr/bin', '/bin'],
creates => "/opt/rh/${python::version}/root/usr/bin/pip",
require => Package['scl-utils'],
Expand Down Expand Up @@ -163,6 +163,11 @@

default: {

package { 'pip':
ensure => $pip_ensure,
require => Package['python'],
}

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

0 comments on commit 7057d4a

Please sign in to comment.