debian-cd

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

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

Commit message

tools/scanpackages: strip signature from InRelease in a slightly better way

To post a comment you must log in.
Revision history for this message
Steve Langasek (vorlon) :
review: Needs Information
Revision history for this message
Michael Hudson-Doyle (mwhudson) :
Revision history for this message
Steve Langasek (vorlon) :
review: Approve

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 91e150b..4002cd7 100755
3--- a/tools/scanpackages
4+++ b/tools/scanpackages
5@@ -57,8 +57,9 @@ $BASEDIR/tools/apt-selection update
6 if [ -e $APT_STATE/lists/*_dists_${CODENAME}_InRelease ]; then
7 # Strip the MD5Sum, SHA1, and SHA256 fields
8 # Update some other information as well
9+ gpg --verify --output - $APT_STATE/lists/*_dists_${CODENAME}_InRelease 2>/dev/null | \
10 sed -e "s/^Architectures: .*$/Architectures: $ALL_ARCHES/" \
11- $APT_STATE/lists/*_dists_${CODENAME}_InRelease | gpg | \
12+ $APT_STATE/lists/*_dists_${CODENAME}_InRelease | \
13 sed -e "s|^Components: .*$|Components: $COMPONENTS|" | \
14 perl -ne 'if (/^(MD5Sum|SHA1|SHA256):/i) { $f=1; next }
15 if ($f) {

Subscribers

People subscribed via source and target branches