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

[Michael Hudson-Doyle]

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

[Steve Langasek (vorlon)]

review: Needs Information

[Steve Langasek (vorlon)]

review: Approve

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