Peppermint
/
debian-cd-clone
mirror of https://salsa.debian.org/images-team/debian-cd.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Backport fix from master: Make update_popcon deal with https on popcon.d.o

This commit is contained in:
Steve McIntyre 2017-11-20 21:29:50 +00:00
parent c7991ae7b2
commit ff82631d6f
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
debian/changelog vendored
View File

@ -27,6 +27,7 @@ debian-cd (3.1.17-jessie) UNRELEASED; urgency=medium
to ensure this works. to ensure this works.
+ Fix size calculation for EFI image + Fix size calculation for EFI image
+ Make tools/update_popcon exit with errors when it fails + Make tools/update_popcon exit with errors when it fails
+ Make tools/update_popcon deal with https on popcon.d.o
-- Steve McIntyre <93sam@debian.org> Mon, 20 Apr 2015 12:36:57 +0100 -- Steve McIntyre <93sam@debian.org> Mon, 20 Apr 2015 12:36:57 +0100

9
tools/update_popcon
View File

@ -7,6 +7,11 @@
DATE=`date` DATE=`date`
dir=/etc/ssl/ca-debian
if [ -d $dir ]; then
capath="--capath $dir"
fi
# Determine temp dir to use # Determine temp dir to use
if [ "$BDIR"x = ""x ] ; then if [ "$BDIR"x = ""x ] ; then
if [ "$TMPDIR"x != ""x ] ; then if [ "$TMPDIR"x != ""x ] ; then
@ -33,7 +38,7 @@ dl_file () {
DIST=$1 DIST=$1
SITE="http://popcon.debian.org/" SITE="http://popcon.debian.org/"
curl -s --head $SITE/$DIST/by_inst > $TDIR/$DIST.head curl -L $capath -s --head $SITE/$DIST/by_inst > $TDIR/$DIST.head
error=$? error=$?
if [ $error -ne 0 ] ; then if [ $error -ne 0 ] ; then
echo "Failed to download correctly: curl error $error on HEAD" >&2 echo "Failed to download correctly: curl error $error on HEAD" >&2
@ -42,7 +47,7 @@ dl_file () {
HEAD_SIZE=`cat $TDIR/$DIST.head | \ HEAD_SIZE=`cat $TDIR/$DIST.head | \
awk '/^Content-Length/ {gsub("\r","");print $2}'` awk '/^Content-Length/ {gsub("\r","");print $2}'`
curl -s $SITE/$DIST/by_inst > $TDIR/$DIST curl -L $capath -s $SITE/$DIST/by_inst > $TDIR/$DIST
error=$? error=$?
DL_SIZE=`stat -c %s $TDIR/$DIST` DL_SIZE=`stat -c %s $TDIR/$DIST`
if [ $error -ne 0 ] ; then if [ $error -ne 0 ] ; then