},
'pref' => {
'path' => $preferences_d,
- 'ext' => '',
+ 'ext' => '.pref',
},
'list' => {
'path' => $sources_list_d,
}
$proxy_defaults = {
- 'host' => undef,
- 'port' => 8080,
- 'https' => false,
+ 'ensure' => undef,
+ 'host' => undef,
+ 'port' => 8080,
+ 'https' => false,
}
$purge_defaults = {
'repos' => 'main universe multiverse restricted',
}
- case $xfacts['lsbdistcodename'] {
- 'lucid': {
+ if $xfacts['lsbdistcodename'] == 'lucid' {
$ppa_options = undef
$ppa_package = 'python-software-properties'
- }
- 'precise': {
+ } elsif $xfacts['lsbdistcodename'] == 'precise' {
$ppa_options = '-y'
$ppa_package = 'python-software-properties'
- }
- 'trusty', 'utopic', 'vivid': {
+ } elsif versioncmp($xfacts['lsbdistrelease'], '14.04') >= 0 {
$ppa_options = '-y'
$ppa_package = 'software-properties-common'
- }
- default: {
+ } else {
$ppa_options = '-y'
$ppa_package = 'python-software-properties'
- }
}
}
undef: {