Skip to content

Commit 30e8065

Browse files
authored
Merge pull request #1169 from fredericgiquel/ppa-deb822
Support PPA in deb822 format
2 parents b565ce0 + cd4653c commit 30e8065

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

lib/facter/apt_sources.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
confine osfamily: 'Debian'
66
setcode do
77
sources = ['sources.list']
8-
Dir.glob('/etc/apt/sources.list.d/*.list').each do |file|
8+
Dir.glob('/etc/apt/sources.list.d/*.{list,sources}').each do |file|
99
sources.push(File.basename(file))
1010
end
1111
sources

manifests/ppa.pp

+5-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,11 @@
5353
$underscore_filename_no_slashes = regsubst($underscore_filename, '/', '-', 'G')
5454
$underscore_filename_no_specialchars = regsubst($underscore_filename_no_slashes, '[\.\+]', '_', 'G')
5555

56-
$sources_list_d_filename = "${dash_filename_no_specialchars}-${release}.list"
56+
$sources_list_d_filename = if versioncmp($facts['os']['release']['full'], '23.10') < 0 {
57+
"${dash_filename_no_specialchars}-${release}.list"
58+
} else {
59+
"${dash_filename_no_specialchars}-${release}.sources"
60+
}
5761

5862
if versioncmp($facts['os']['release']['full'], '21.04') < 0 {
5963
$trusted_gpg_d_filename = "${underscore_filename_no_specialchars}.gpg"

0 commit comments

Comments
 (0)