lenses: aptsources: Parse all types of options in apt sources file #865
Conversation
This file contains hidden or 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
- Currently, only two options with keys arch= or trusted= are allowed. However, as documented in apt manual page[1], there are many different options possible. Apt itself parses these options in a much more generic way[2][3]. - This patches allows parsing all the different options allowed by apt. A practical example (accepted by apt) is also provided as a test case. Link: https://manpages.debian.org/trixie/apt/sources.list.5.en.html Link: https://salsa.debian.org/apt-team/apt/-/blob/3c9399e643a07074d47c9bceca88e8d43ff55d36/apt-pkg/sourcelist.cc#L215 Link: https://salsa.debian.org/apt-team/apt/-/blob/3c9399e643a07074d47c9bceca88e8d43ff55d36/apt-pkg/contrib/strutl.cc#L245 Signed-off-by: Sunil Mohan Adapa <[email protected]>
SunilMohanAdapa
force-pushed
the
aptsources-allow-all-options
branch
from
176c7a8 to
2a14986
Compare
jvalleroy
pushed a commit
to freedombox/FreedomBox
that referenced
this pull request
Sep 21, 2025
Fixes: #2251 Fixes: #2426 - Temporarily add a bug fix for the one-line style apt sources format. Upstream submission: hercules-team/augeas#865 . - Currently, only two options with keys arch= or trusted= are allowed. However, as documented in apt manual page[1], there are many different options possible. Apt itself parses these options in a much more generic way[2][3]. - Fixes allow parsing all the different options allowed by apt. A practical example (accepted by apt) is also provided as a test case. Tests: - Add the following line to one of the apt sources file in /etc/apt/sources.list.d: "deb [signed-by=/usr/share/keyrings/debian-archive-trixie-stable.gpg] https://deb.debian.org/debian trixie main". In augtool, print /augeas/files/etc/apt/sources.list.d//error. - With the patch, run 'make build install' and errors in augtool disappear. - In tor proxy app, enabling/disabling apt through tor works. The files in /etc/apt/ are updated as expected. Link: https://manpages.debian.org/trixie/apt/sources.list.5.en.html Link: https://salsa.debian.org/apt-team/apt/-/blob/3c9399e643a07074d47c9bceca88e8d43ff55d36/apt-pkg/sourcelist.cc#L215 Link: https://salsa.debian.org/apt-team/apt/-/blob/3c9399e643a07074d47c9bceca88e8d43ff55d36/apt-pkg/contrib/strutl.cc#L245 Signed-off-by: Sunil Mohan Adapa <[email protected]> Reviewed-by: James Valleroy <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Currently, only two options with keys arch= or trusted= are allowed. However, as documented in apt manual page[1], there are many different options possible. Apt itself parses these options in a much more generic way[2][3].
This patches allows parsing all the different options allowed by apt. A practical example (accepted by apt) is also provided as a test case.
Link: https://manpages.debian.org/trixie/apt/sources.list.5.en.html
Link: https://salsa.debian.org/apt-team/apt/-/blob/3c9399e643a07074d47c9bceca88e8d43ff55d36/apt-pkg/sourcelist.cc#L215
Link: https://salsa.debian.org/apt-team/apt/-/blob/3c9399e643a07074d47c9bceca88e8d43ff55d36/apt-pkg/contrib/strutl.cc#L245