Merge ~mwhudson/debian-cd/+git/ubuntu:fix-release-signing into ~ubuntu-cdimage/debian-cd/+git/ubuntu:main

Proposed by Michael Hudson-Doyle
Status: Merged
Merged at revision: c20a281a0544c73c39ddb1d7fdeed4b7d04c02ca
Proposed branch: ~mwhudson/debian-cd/+git/ubuntu:fix-release-signing
Merge into: ~ubuntu-cdimage/debian-cd/+git/ubuntu:main
Diff against target: 13 lines (+1/-1)
1 file modified
tools/scanpackages (+1/-1)
Reviewer Review Type Date Requested Status
Steve Langasek Approve
Review via email: mp+455315@code.launchpad.net

Commit message

run the InRelease file through gpg to strip some signatures

Description of the change

I think this will help the problem seen on recent dailies but there is some other code I have some questions about...

To post a comment you must log in.
Revision history for this message
Steve Langasek (vorlon) wrote :

well it can't hurt

review: Approve
Revision history for this message
Michael Hudson-Doyle (mwhudson) wrote :

The code I was complaining about IRL a few minutes ago turns out to be dead so I pushed its deletion to the dead code branch that was already in review.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/tools/scanpackages b/tools/scanpackages
2index a6660ac..91e150b 100755
3--- a/tools/scanpackages
4+++ b/tools/scanpackages
5@@ -58,7 +58,7 @@ if [ -e $APT_STATE/lists/*_dists_${CODENAME}_InRelease ]; then
6 # Strip the MD5Sum, SHA1, and SHA256 fields
7 # Update some other information as well
8 sed -e "s/^Architectures: .*$/Architectures: $ALL_ARCHES/" \
9- $APT_STATE/lists/*_dists_${CODENAME}_InRelease | \
10+ $APT_STATE/lists/*_dists_${CODENAME}_InRelease | gpg | \
11 sed -e "s|^Components: .*$|Components: $COMPONENTS|" | \
12 perl -ne 'if (/^(MD5Sum|SHA1|SHA256):/i) { $f=1; next }
13 if ($f) {

Subscribers

People subscribed via source and target branches