From: Michael Speth <mspeth@monky-games.com>
Date: Sun, 9 Jan 2022 09:32:01 +0000 (+1300)
Subject: Fixed gpg file for Ubuntu versions 21.04 and later.
X-Git-Tag: v8.4.0~16^2
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=fa827b740ee940cd8599f06c606568501cde15fc;p=puppet-modules%2Fpuppetlabs-apt.git

Fixed gpg file for Ubuntu versions 21.04 and later.

As of Ubuntu 21.04, Canotical has again changed the filename of the gpg files going back to dashes
instead of using underscores.
---

diff --git a/manifests/ppa.pp b/manifests/ppa.pp
index 311f81d..accf0fc 100644
--- 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"
 
-  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"