Skip to content

Add deb822 format ppa support on Ubuntu 24.04 #1191

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Add deb822 format ppa support on Ubuntu 24.04 #1191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion lib/facter/apt_sources.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
# frozen_string_literal: true

# This fact lists the .list filenames that are used by apt.
# This fact lists the .list and .sources filenames that are used by apt.
Facter.add(:apt_sources) do
confine osfamily: 'Debian'
setcode do
sources = ['sources.list']
Dir.glob('/etc/apt/sources.list.d/*.list').each do |file|
sources.push(File.basename(file))
end
Dir.glob('/etc/apt/sources.list.d/*.sources').each do |file|
sources.push(File.basename(file))
end
sources
end
end
6 changes: 5 additions & 1 deletion manifests/ppa.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'], '24.04') < 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"
Expand Down