fix: handle existing ubuntu deb822 sources #136
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
tigarmo
force-pushed
the
work/CRAFT-3538-noble-key-conflict
branch
from
9c3e44d to
ed2af43
Compare
The problem is this: since Noble, the default Ubuntu archives are listed as deb822 sources in /etc/apt/sources.lists.d/ubuntu.sources as signed by a key in /usr/share/keyrings. Trying to declare a package-repository with the url of an official archive (e.g. to add an architecture) would then fail because apt complained that a given suite under archive.ubuntu.com/ubuntu was being declared as Signed-By two keyrings (the official one and the craft-added one). This commit updates the handling of sources for the specific case of those sources that are also declared in ubuntu.sources: - IF a package-repository has an url that matches an official repo, - AND IF this repo is already declared in a deb822-format sources file, - AND IF the requested key-id is present in the existing sources' declared keyring, ... then the new sources file will point to the existing keyring, instead of the usual CRAFT-xxx keyring. This commit updates a lot of code, but most of of it is moving existing code around, and the new code specifically only applies to the 'ubuntu.sources' file. This is to minimize the blast-radius of this change and allow this to be a 'fix' rather than a 'feat'. Fixes #129
tigarmo
force-pushed
the
work/CRAFT-3538-noble-key-conflict
branch
from
ed2af43 to
0feea5b
Compare
tigarmo
commented
Oct 17, 2024
Co-authored-by: Callahan <callahan.kovacs@canonical.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The problem is this: since Noble, the default Ubuntu archives are listed as deb822 sources in
/etc/apt/sources.lists.d/ubuntu.sourcesas signed by a key in/usr/share/keyrings. Trying to declare a package-repository with the url of an official archive (e.g. to add an architecture) would then fail because apt complained that a given suite under archive.ubuntu.com/ubuntu was being declared as Signed-By two keyrings (the official one and the craft-added one).This commit updates the handling of sources for the specific case of those sources that are also declared in
ubuntu.sources:... then the new sources file will point to the existing keyring, instead of the usual CRAFT-xxx keyring. This commit updates a lot of code, but most of of it is moving existing code around, and the new code specifically only applies to the
ubuntu.sourcesfile. This is to minimize the blast-radius of this change and allow this to be a 'fix' rather than a 'feat'.Fixes #129
tox?