Code Review
/
puppet-modules
/
puppetlabs-apt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Release version 8.1.0
[puppet-modules/puppetlabs-apt.git]
/
manifests
/
backports.pp
diff --git
a/manifests/backports.pp
b/manifests/backports.pp
index b3cb74b5221531fd6bbb8b1efd59224e8488492b..080c83dd350eb2a8027f88d691ace3f2e2f81bc8 100644
(file)
--- a/
manifests/backports.pp
+++ b/
manifests/backports.pp
@@
-7,7
+7,7
@@
# repos => 'main universe multiverse restricted',
# key => {
# id => '630239CC130E1A7FD81A27B140976EAF437D05B5',
# repos => 'main universe multiverse restricted',
# key => {
# id => '630239CC130E1A7FD81A27B140976EAF437D05B5',
-# server => '
hkps.pool.sks-keyservers.net
',
+# server => '
keyserver.ubuntu.com
',
# },
# }
#
# },
# }
#
@@
-21,7
+21,7
@@
#
# @param release
# Specifies a distribution of the Apt repository containing the backports to manage. Used in populating the `source.list` configuration file.
#
# @param release
# Specifies a distribution of the Apt repository containing the backports to manage. Used in populating the `source.list` configuration file.
-# Default: on Debian and Ubuntu,
'${lsbdistcodename}-backports'
. We recommend keeping this default, except on other operating
+# Default: on Debian and Ubuntu,
`${facts['os']['distro']['codename']}-backports`
. We recommend keeping this default, except on other operating
# systems.
#
# @param repos
# systems.
#
# @param repos
@@
-70,16
+70,16
@@
class apt::backports (
if $key {
$_key = $key
}
if $key {
$_key = $key
}
- if (!($facts['
lsbdistid'] == 'Debian' or $facts['lsbdistid
'] == 'Ubuntu')) {
+ if (!($facts['
os']['name'] == 'Debian' or $facts['os']['name
'] == 'Ubuntu')) {
unless $location and $release and $repos and $key {
unless $location and $release and $repos and $key {
- fail(
translate('If not on Debian or Ubuntu, you must explicitly pass location, release, repos, and key')
)
+ fail(
'If not on Debian or Ubuntu, you must explicitly pass location, release, repos, and key'
)
}
}
unless $location {
$_location = $::apt::backports['location']
}
unless $release {
}
}
unless $location {
$_location = $::apt::backports['location']
}
unless $release {
- $_release = "${facts['
lsbdist
codename']}-backports"
+ $_release = "${facts['
os']['distro']['
codename']}-backports"
}
unless $repos {
$_repos = $::apt::backports['repos']
}
unless $repos {
$_repos = $::apt::backports['repos']
@@
-98,7
+98,7
@@
class apt::backports (
'release' => $_release,
}
} else {
'release' => $_release,
}
} else {
- fail(
translate('pin must be either a string, number or hash')
)
+ fail(
'pin must be either a string, number or hash'
)
}
apt::source { 'backports':
}
apt::source { 'backports':