From 3f860628374033960b0afd9a59ec6821b30bbf0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Giquel?=
 <frederic.giquel@imt-atlantique.fr>
Date: Tue, 12 Mar 2024 10:01:05 +0100
Subject: [PATCH 1/3] Support PPA in deb822 format

---
 lib/facter/apt_sources.rb | 2 +-
 manifests/ppa.pp          | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/lib/facter/apt_sources.rb b/lib/facter/apt_sources.rb
index c985802010..17c5d089e8 100644
--- a/lib/facter/apt_sources.rb
+++ b/lib/facter/apt_sources.rb
@@ -5,7 +5,7 @@
   confine osfamily: 'Debian'
   setcode do
     sources = ['sources.list']
-    Dir.glob('/etc/apt/sources.list.d/*.list').each do |file|
+    Dir.glob('/etc/apt/sources.list.d/*.{list,sources}').each do |file|
       sources.push(File.basename(file))
     end
     sources
diff --git a/manifests/ppa.pp b/manifests/ppa.pp
index 1bb4c81866..c24cb4ebea 100644
--- a/manifests/ppa.pp
+++ b/manifests/ppa.pp
@@ -53,7 +53,11 @@
   $underscore_filename_no_slashes      = regsubst($underscore_filename, '/', '-', 'G')
   $underscore_filename_no_specialchars = regsubst($underscore_filename_no_slashes, '[\.\+]', '_', 'G')
 
-  $sources_list_d_filename  = "${dash_filename_no_specialchars}-${release}.list"
+  if versioncmp($facts['os']['release']['full'], '23.10') < 0 {
+    $sources_list_d_filename  = "${dash_filename_no_specialchars}-${release}.list"
+  } else {
+    $sources_list_d_filename  = "${dash_filename_no_specialchars}-${release}.sources"
+  }
 
   if versioncmp($facts['os']['release']['full'], '21.04') < 0 {
     $trusted_gpg_d_filename = "${underscore_filename_no_specialchars}.gpg"

From b301beffa04cb8f2fb5e4e99b6a66037acf8fc96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Giquel?= <frederic.giquel@laposte.net>
Date: Wed, 13 Mar 2024 09:11:38 +0100
Subject: [PATCH 2/3] A bit less repetition

Co-authored-by: Kenyon Ralph <kenyon@kenyonralph.com>
---
 manifests/ppa.pp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/manifests/ppa.pp b/manifests/ppa.pp
index c24cb4ebea..901740efe4 100644
--- a/manifests/ppa.pp
+++ b/manifests/ppa.pp
@@ -53,10 +53,10 @@
   $underscore_filename_no_slashes      = regsubst($underscore_filename, '/', '-', 'G')
   $underscore_filename_no_specialchars = regsubst($underscore_filename_no_slashes, '[\.\+]', '_', 'G')
 
-  if versioncmp($facts['os']['release']['full'], '23.10') < 0 {
-    $sources_list_d_filename  = "${dash_filename_no_specialchars}-${release}.list"
+  $sources_list_d_filename = if versioncmp($facts['os']['release']['full'], '23.10') < 0 {
+    "${dash_filename_no_specialchars}-${release}.list"
   } else {
-    $sources_list_d_filename  = "${dash_filename_no_specialchars}-${release}.sources"
+    $"${dash_filename_no_specialchars}-${release}.sources"
   }
 
   if versioncmp($facts['os']['release']['full'], '21.04') < 0 {

From cd4653ceeecfa544a34ce0d40ec821856cbae721 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Giquel?= <frederic.giquel@laposte.net>
Date: Wed, 23 Oct 2024 14:02:08 +0200
Subject: [PATCH 3/3] Fix typo

Co-authored-by: Kenyon Ralph <kenyon@kenyonralph.com>
---
 manifests/ppa.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/ppa.pp b/manifests/ppa.pp
index 901740efe4..b1a055ecae 100644
--- a/manifests/ppa.pp
+++ b/manifests/ppa.pp
@@ -56,7 +56,7 @@
   $sources_list_d_filename = if versioncmp($facts['os']['release']['full'], '23.10') < 0 {
     "${dash_filename_no_specialchars}-${release}.list"
   } else {
-    $"${dash_filename_no_specialchars}-${release}.sources"
+    "${dash_filename_no_specialchars}-${release}.sources"
   }
 
   if versioncmp($facts['os']['release']['full'], '21.04') < 0 {