define apt::ppa(
$release = $::lsbdistcodename,
- $options = "-y"
+ $options = '-y'
) {
include apt::params
include apt::update
fail('lsbdistcodename fact not available: release parameter required')
}
- $filename_without_slashes = regsubst($name, '/', '-', G)
- $filename_without_dots = regsubst($filename_without_slashes, '\.', '_', G)
- $filename_without_ppa = regsubst($filename_without_dots, '^ppa:', '', G)
+ $filename_without_slashes = regsubst($name, '/', '-', 'G')
+ $filename_without_dots = regsubst($filename_without_slashes, '\.', '_', 'G')
+ $filename_without_ppa = regsubst($filename_without_dots, '^ppa:', '', 'G')
$sources_list_d_filename = "${filename_without_ppa}-${release}.list"
$package = $::lsbdistrelease ? {
}
if defined(Class[apt]) {
- $proxy_host = getparam(Class[apt], "proxy_host")
- $proxy_port = getparam(Class[apt], "proxy_port")
+ $proxy_host = $apt::proxy_host
+ $proxy_port = $apt::proxy_port
case $proxy_host {
- false: {
- $proxy_env = ""
+ false, '': {
+ $proxy_env = []
}
default: {$proxy_env = ["http_proxy=http://${proxy_host}:${proxy_port}", "https_proxy=http://${proxy_host}:${proxy_port}"]}
}
} else {
- $proxy_env = ""
+ $proxy_env = []
}
exec { "add-apt-repository-${name}":
environment => $proxy_env,
- command => "/usr/bin/add-apt-repository ${options} ${name}",
- creates => "${sources_list_d}/${sources_list_d_filename}",
- logoutput => 'on_failure',
- require => [
+ command => "/usr/bin/add-apt-repository ${options} ${name}",
+ unless => "/usr/bin/test -s ${sources_list_d}/${sources_list_d_filename}",
+ logoutput => 'on_failure',
+ notify => Exec['apt_update'],
+ require => [
File[$sources_list_d],
- Package["${package}"],
+ Package[$package],
],
- notify => Exec['apt_update'],
}
file { "${sources_list_d}/${sources_list_d_filename}":