(GH-1038) add support for `check-valid-until` configuration

[puppet-modules/puppetlabs-apt.git] / manifests / ppa.pp

diff --git a/manifests/ppa.pp b/manifests/ppa.pp
index 6a874ce3dc1fb38ec773f972f92fa76b76e3b378..bab7b337e3dbc4918982517e35f520b9b7bcd02d 100644 (file)
--- a/manifests/ppa.pp
+++ b/manifests/ppa.pp
@@ -23,20 +23,20 @@
 # @param package_manage
 #   Specifies whether Puppet should manage the package that provides `apt-add-repository`.
 #
-define apt::ppa(
+define apt::ppa (
   String $ensure                 = 'present',
   Optional[String] $options      = $::apt::ppa_options,
-  Optional[String] $release      = $facts['os']['distro']['codename'],
+  Optional[String] $release      = fact('os.distro.codename'),
   Optional[String] $dist         = $facts['os']['name'],
   Optional[String] $package_name = $::apt::ppa_package,
   Boolean $package_manage        = false,
 ) {
   unless $release {
-    fail(translate('os.distro.codename fact not available: release parameter required'))
+    fail('os.distro.codename fact not available: release parameter required')
   }
 
   if $dist == 'Debian' {
-    fail(translate('apt::ppa is not currently supported on Debian.'))
+    fail('apt::ppa is not currently supported on Debian.')
   }
 
   if versioncmp($facts['os']['release']['full'], '14.10') >= 0 {
@@ -55,7 +55,8 @@ define apt::ppa(
 
   $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"