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
Fixed gpg file for Ubuntu versions 21.04 and later.
[puppet-modules/puppetlabs-apt.git]
/
manifests
/
ppa.pp
diff --git
a/manifests/ppa.pp
b/manifests/ppa.pp
index 311f81df0e79d72b309e5edd303c00a4f63fbe3c..accf0fc4bc53250f383f8d0a01a07115397c74d5 100644
(file)
--- a/
manifests/ppa.pp
+++ b/
manifests/ppa.pp
@@
-55,7
+55,8
@@
define apt::ppa(
$sources_list_d_filename = "${dash_filename_no_specialchars}-${release}.list"
$sources_list_d_filename = "${dash_filename_no_specialchars}-${release}.list"
- if versioncmp($facts['os']['release']['full'], '15.10') >= 0 {
+ if versioncmp($facts['os']['release']['full'], '15.10') >= 0 and
+ versioncmp($facts['os']['release']['full'], '21.04') < 0 {
$trusted_gpg_d_filename = "${underscore_filename_no_specialchars}.gpg"
} else {
$trusted_gpg_d_filename = "${dash_filename_no_specialchars}.gpg"
$trusted_gpg_d_filename = "${underscore_filename_no_specialchars}.gpg"
} else {
$trusted_gpg_d_filename = "${dash_filename_no_specialchars}.gpg"