Miroirs/sbopkg
1
0
Fork 0
mirror of https://github.com/sbopkg/sbopkg synced 2024-11-16 07:47:55 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix download failure

Browse source 
When an http url 301ed to an https and the certificate check failed,
sbopkg's certcheck code was not being triggered, causing the download to
fail. Thanks to vbatts for raising this issue.
This commit is contained in:
slakmagik 2011-02-19 21:32:29 +00:00
parent 72a0269454
commit 07a8ec3d84
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/usr/doc/THANKS
View file

@ -70,3 +70,4 @@ apologize. Thank you!
849 chytraeus (bug report)
850 greinze (bug report)
853 Pablo Castano Fernandez (translations)
863 vbatts (bug report)

7
src/usr/sbin/sbopkg
View file

@ -2880,7 +2880,7 @@ get_source() {
local DLDIR=$SBOPKGTMP/sbopkg-download
local SBOPKG_PIDLIST=$SBOPKGTMP/sbopkgpidlist
local TMPSUMMARYLOG=$SBOPKGTMP/sbopkg-tmp-summarylog
local SRCNAME DL_SRCNAME DL FAILURE MD5CHK i CWD TWGETFLAGS
local SRCNAME DL_SRCNAME DL FAILURE MD5CHK i CWD TWGETFLAGS WGETRC
# Don't pollute the environment with the .info content...
local PRGNAM VERSION HOMEPAGE DOWNLOAD MD5SUM MAINTAINER EMAIL APPROVED
@ -2928,7 +2928,8 @@ get_source() {
if [[ -z $NO_DL_LOOP ]]; then
wget $TWGETFLAGS ${DOWNLOAD[$i]} >> $SBOPKGOUTPUT &
echo "$!" >> $SBOPKG_PIDLIST 2>> $SBOPKGOUTPUT
wait
wait $!
WGETRC=$?
else
FAILURE=loop
echo " Download failed. Please report this as a bug." >> \
@ -2944,7 +2945,7 @@ get_source() {
NO_DL_LOOP=1
mv "$DL" "$SRCDIR/$DL_SRCNAME"
else
if [[ ${DOWNLOAD[$i]} == https://* &&
if [[ $WGETRC == 5 &&
$TWGETFLAGS != *no-check-certificate* ]]; then
check_cert_prompt && continue
fi