WIP: Refinements on __apt_source & --signed-by #337

Draft
fancsali wants to merge 3 commits from fancsali/cdist:apt-source-signed-by into master
Contributor

Allow multple GPG keys/keyrings to be specified, and also include them
for the source repositories (deb-src lines).

Also fix cases where we ended up with extra leading/trainling or double
space character(s) between parts of the config line.

Allow multple GPG keys/keyrings to be specified, and also include them for the source repositories (deb-src lines). Also fix cases where we ended up with extra leading/trainling or double space character(s) between parts of the config line.
Allow multple GPG keys/keyrings to be specified, and also include them
for the source repositories (deb-src lines).

Also fix cases where we ended up with extra leading/trainling or double
space character(s) between parts of the config line.
Owner

Similar to #336: optional multiple have a separate section in the docs, so the parameter should be shifted into its section.

Fix required before merge possible.

Similar to #336: optional multiple have a separate section in the docs, so the parameter should be shifted into its section. Fix required before merge possible.
fancsali changed title from WIP: Refinements on __apt_source & --signed-by to Refinements on __apt_source & --signed-by 2022-07-14 19:36:04 +00:00
@ -3,2 +3,4 @@
entry="$uri $distribution $component"
options="$forcedarch $signed_by"
options=${options## }; options=${options%% }
Owner

Why is the front & back whitespace stripping necessary?

Why is the front & back whitespace stripping necessary?
Author
Contributor

Because $signed_by and $forcedarch can both be empty, so we might end up with something like signed-by=ABCDEF or arch=amd64 .

Besides $signed_by itself is multi-valued and assembled by a for-loop.

Because `$signed_by` and `$forcedarch` can both be empty, so we might end up with something like ` signed-by=ABCDEF` or `arch=amd64 `. Besides `$signed_by` itself is multi-valued and assembled by a for-loop.
@ -40,0 +37,4 @@
OPTIONAL MULTIPLE PARAMETERS
----------------------------
signed-by
provide a GPG key fingerprint or keyring path for signature checks. May be repeated.
Owner

Good, besides "may be repeated" is already implied by the optional multiple parameters and thus can be removed

Good, besides "may be repeated" is already implied by the optional multiple parameters and thus can be removed
Author
Contributor

Fair point; should be fixed now.

Fair point; should be fixed now.
fancsali changed title from Refinements on __apt_source & --signed-by to WIP: Refinements on __apt_source & --signed-by 2022-07-18 10:59:45 +00:00
This pull request is marked as a work in progress.
This branch is out-of-date with the base branch
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u apt-source-signed-by:fancsali-apt-source-signed-by
git switch fancsali-apt-source-signed-by

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch master
git merge --no-ff fancsali-apt-source-signed-by
git switch fancsali-apt-source-signed-by
git rebase master
git switch master
git merge --ff-only fancsali-apt-source-signed-by
git switch fancsali-apt-source-signed-by
git rebase master
git switch master
git merge --no-ff fancsali-apt-source-signed-by
git switch master
git merge --squash fancsali-apt-source-signed-by
git switch master
git merge --ff-only fancsali-apt-source-signed-by
git switch master
git merge fancsali-apt-source-signed-by
git push origin master
Sign in to join this conversation.
No reviewers
No milestone
No project
No assignees
2 participants
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
ungleich-public/cdist!337
No description provided.