if $facts['lsbdistcodename'] {
$_release = $facts['lsbdistcodename']
} else {
- fail('lsbdistcodename fact not available: release parameter required')
+ fail(translate('lsbdistcodename fact not available: release parameter required'))
}
} else {
$_release = $release
if $ensure == 'present' {
if ! $location {
- fail('cannot create a source entry without specifying a location')
+ fail(translate('cannot create a source entry without specifying a location'))
}
# Newer oses, do not need the package for HTTPS transport.
$_transport_https_releases = [ 'wheezy', 'jessie', 'stretch', 'trusty', 'xenial' ]
- if $_release in $_transport_https_releases and $location =~ /(?i:^https:\/\/)/ {
+ if ($_release in $_transport_https_releases or $facts['lsbdistcodename'] in $_transport_https_releases) and $location =~ /(?i:^https:\/\/)/ {
ensure_packages('apt-transport-https')
}
}
if $key {
if $key =~ Hash {
unless $key['id'] {
- fail('key hash must contain at least an id entry')
+ fail(translate('key hash must contain at least an id entry'))
}
$_key = merge($::apt::source_key_defaults, $key)
} else {
'origin' => $host,
}
} else {
- fail('Received invalid value for pin parameter')
+ fail(translate('Received invalid value for pin parameter'))
}
create_resources('apt::pin', { "${name}" => $_pin })
}
# We do not want to remove keys when the source is absent.
if $key and ($ensure == 'present') {
if $_key =~ Hash {
+ if $_key['ensure'] != undef {
+ $_ensure = $_key['ensure']
+ } else {
+ $_ensure = $ensure
+ }
+
apt::key { "Add key: ${$_key['id']} from Apt::Source ${title}":
- ensure => present,
+ ensure => $_ensure,
id => $_key['id'],
server => $_key['server'],
content => $_key['content'],