Merge ~ogayot/debian-cd:fix-2044239 into ~ubuntu-cdimage/debian-cd/+git/ubuntu:main

[Olivier Gayot]

tools/scanpackages: fix sed invocation, not using stdin as it should

When stripping signatures from InRelease, we used to pass the output of
sed to gpg. Recently, we changed the logic so that the output of gpg is
passed to sed instead. However, we forgot to drop the second positional
argument of sed - which forces sed to ignore stdin and to operate on the
positional argument instead.

Therefore, the output of gpg gets ignored.

Signed-off-by: Olivier Gayot <email address hidden>

The change is untested (not sure how to run debian-cd) but the change /feels/ sensible to me..

[Steve Langasek (vorlon)]

review: Approve

[Michael Hudson-Doyle (mwhudson)]

Sigh, sorry :(

diff --git a/tools/scanpackages b/tools/scanpackages
index 4002cd7..60dd66d 100755
--- a/tools/scanpackages
+++ b/tools/scanpackages
@@ -58,8 +58,7 @@ 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 | \
+    sed -e "s/^Architectures: .*$/Architectures: $ALL_ARCHES/" | \
     sed -e "s|^Components: .*$|Components: $COMPONENTS|" | \
     perl -ne 'if (/^(MD5Sum|SHA1|SHA256):/i) { $f=1; next } 
     if ($f) {