Fix syntax bug in try_di_image_cache()

Add warnings if download links we're using are insecure (i.e. not
https). May turn these into errors later...
This commit is contained in:
Steve McIntyre 2013-12-16 15:15:53 +00:00
parent 9dfd255e83
commit 546559365e
2 changed files with 16 additions and 3 deletions

3
debian/changelog vendored
View File

@ -19,7 +19,8 @@ debian-cd (3.1.14) UNRELEASED; urgency=low
instead work it out directly from the dependencies of the task-desktop
package.
* tools/boot/jessie/*: Pull out some more common code into common.sh to
simplify the various boot-$arch scripts
simplify the various boot-$arch scripts. Warn about potentially
insecure download locations.
[ Robert Spencer ]
* Build without isolinux/desktop. Closes: #706150

View File

@ -101,9 +101,21 @@ calc_boot_size() {
# If we're looking for an image location to download, see if it's in a
# local cache first.
try_di_image_cache() {
if [ -n "$DI_DIR" -a -e "$DI_DIR/~${DI_WWW_HOME#*~}" ] ; then
DI_DIR="$DI_DIR/${DI_WWW_HOME#*http://}"
DI_TMP_DIR=${DI_WWW_HOME#*http://}
if [ -n "$DI_DIR" ] && [ -e "${DI_DIR}/${DI_TMP_DIR}" ] ; then
DI_DIR="$DI_DIR/${DI_TMP_DIR}"
DI_WWW_HOME=""
echo "Using images from local cache: $DI_DIR"
else
# If not, we'll end up downloading. Complain if the download
# link looks insecure (i.e. not https). May cause builds to
# fail here in future...
case "$DI_WWW_HOME"x in
"http://"*x|"ftp://"*x)
echo "WARNING WARNING WARNING WARNING WARNING WARNING"
echo "$0: insecure download for d-i build: $DI_WWW_HOME"
echo "WARNING WARNING WARNING WARNING WARNING WARNING"
;;
esac
fi
}