Skip to content

Commit 2adb801

Browse files
authored
Merge pull request #450 from ekohl/debian-virtualenv
Fix Ubuntu bionic package installation
2 parents f274e51 + b0111c2 commit 2adb801

File tree

1 file changed

+23
-20
lines changed

1 file changed

+23
-20
lines changed

manifests/install.pp

Lines changed: 23 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -204,31 +204,34 @@
204204
}
205205
}
206206

207-
if $::osfamily == 'RedHat' {
208-
if $pip_ensure != 'absent' {
209-
if $python::use_epel == true {
210-
include 'epel'
211-
Class['epel'] -> Package['pip']
207+
case $facts['os']['family'] {
208+
'RedHat': {
209+
if $pip_ensure != 'absent' {
210+
if $python::use_epel == true {
211+
include 'epel'
212+
Class['epel'] -> Package['pip']
213+
}
212214
}
215+
if ($venv_ensure != 'absent') and ($::operatingsystemrelease =~ /^6/) {
216+
if $python::use_epel == true {
217+
include 'epel'
218+
Class['epel'] -> Package['virtualenv']
219+
}
220+
}
221+
222+
$virtualenv_package = "${python}-virtualenv"
213223
}
214-
if ($venv_ensure != 'absent') and ($::operatingsystemrelease =~ /^6/) {
215-
if $python::use_epel == true {
216-
include 'epel'
217-
Class['epel'] -> Package['virtualenv']
224+
'Debian': {
225+
if fact('lsbdistcodename') == 'trusty' {
226+
$virtualenv_package = 'python-virtualenv'
227+
} else {
228+
$virtualenv_package = 'virtualenv'
218229
}
219230
}
220-
221-
$virtualenv_package = "${python}-virtualenv"
222-
} else {
223-
if fact('lsbdistcodename') == 'jessie' {
231+
'Gentoo': {
224232
$virtualenv_package = 'virtualenv'
225-
} elsif fact('lsbdistcodename') == 'stretch' {
226-
$virtualenv_package = 'virtualenv'
227-
} elsif fact('lsbdistcodename') == 'xenial' {
228-
$virtualenv_package = 'virtualenv'
229-
} elsif $facts['os']['family'] == 'Gentoo' {
230-
$virtualenv_package = 'virtualenv'
231-
} else {
233+
}
234+
default: {
232235
$virtualenv_package = 'python-virtualenv'
233236
}
234237
}

0 commit comments

Comments
 (0)