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

Make update_popcon cope with https on popcon.d.o 

Tell curl to follow redirects
Add explicit capath argument if needed, as on debian.org machines
This commit is contained in:
Steve McIntyre 2017-11-20 21:27:25 +00:00
parent 078be0016d
commit 013d09f686
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

@ -6,6 +6,7 @@ debian-cd (3.1.21) UNRELEASED; urgency=medium
network-manager-gnome, synaptic) network-manager-gnome, synaptic)
* Start buster, simply copying stretch for now * Start buster, simply copying stretch for now
* Add SHA256 checksums to Packages files for update images * Add SHA256 checksums to Packages files for update images
* Make update_popcon deal with https on popcon.d.o
[ JH Chatenet ] [ JH Chatenet ]
* Include debian-ports-archive-keyring on non released architectures * Include debian-ports-archive-keyring on non released architectures

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