diff --git a/debian/changelog b/debian/changelog index 47dc3811..5f4af16a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +debian-cd (3.1.30) UNRELEASED; urgency=medium + + [ Steve McIntyre ] + * tools/update_popcon: cope with lower-case HTTP headers too; Debian + just enabled http2 so this broke + + -- Steve McIntyre <93sam@debian.org> Sat, 01 Aug 2020 12:43:04 +0100 + debian-cd (3.1.29) unstable; urgency=medium [ Raphaƫl Hertzog ] diff --git a/tools/update_popcon b/tools/update_popcon index 01685e27..e7681f6e 100755 --- a/tools/update_popcon +++ b/tools/update_popcon @@ -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" }