Backport update_popcon fix

This commit is contained in:
Steve McIntyre 2020-08-01 12:43:25 +01:00
parent a2dd5ae5d4
commit 05f47eb53f
2 changed files with 7 additions and 5 deletions

4
debian/changelog vendored
View File

@ -1,10 +1,12 @@
debian-cd (3.1.26-buster) UNRELEASED; urgency=medium
[ Steve McIntyre ]
* Backports of fixes from debian-cd in unstable
+ Keep grub resolution in EFI boot, to avoid tiny fonts (closes: #935546).
+ Fix up ordering in imagesums
+ Add a "with firmware" text to the DISKINFO string when appropriate
+ Remove lilo-installer and elilo-installer for all arches
+ tools/update_popcon: cope with lower-case HTTP headers too; Debian
just enabled http2 so this broke
-- Samuel Thibault <sthibault@debian.org> Fri, 23 Aug 2019 21:51:50 +0200

View File

@ -45,7 +45,7 @@ dl_file () {
exit 1
fi
HEAD_SIZE=`cat $TDIR/$DIST.head | \
awk '/^Content-Length/ {gsub("\r","");print $2}'`
awk '/^.ontent-.ength/ {gsub("\r","");print $2}'`
curl -L $capath -s $SITE/$DIST/by_inst > $TDIR/$DIST
error=$?
@ -55,14 +55,14 @@ dl_file () {
exit 1
fi
if [ $DL_SIZE != $HEAD_SIZE ] ; then
if [ "$DL_SIZE"x != "$HEAD_SIZE"x ] ; then
echo "Failed to download correctly: expected $HEAD_SIZE bytes, but got $DL_SIZE bytes" >&2
exit 1
fi
LASTMOD=`awk '/^Last-Modified:/ {
LASTMOD=`awk '/^.ast-.odified:/ {
gsub("\r","")
gsub("^Last-Modified: ","")
gsub("^.ast-.odified: ","")
print $0}' $TDIR/$DIST.head`
echo "$LASTMOD"
}