From f3544ff68eac6a62d71abff9a82eb787b18d8d2f Mon Sep 17 00:00:00 2001 From: Lyndon Brown Date: Tue, 11 Feb 2020 17:36:54 +0000 Subject: installer: de-dup daily DI url Closes: #952860 --- scripts/build/installer_debian-installer | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'scripts/build/installer_debian-installer') diff --git a/scripts/build/installer_debian-installer b/scripts/build/installer_debian-installer index 80655e67f..1f3cf7574 100755 --- a/scripts/build/installer_debian-installer +++ b/scripts/build/installer_debian-installer @@ -240,6 +240,9 @@ VMLINUZ_GI="gtk/vmlinuz" INITRD_GI="gtk/initrd.gz" DESTDIR_GI="${DESTDIR}/gtk" +# Debian Installer daily builds +DAILY_DI_URL="https://d-i.debian.org/daily-images/${LB_ARCHITECTURES}/daily/" + case "${LB_DERIVATIVE}" in false) if [ "${LB_DEBIAN_INSTALLER_DISTRIBUTION}" = "daily" ] @@ -247,8 +250,7 @@ case "${LB_DERIVATIVE}" in # FIXME: variable name should be decupled from derivatves LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION="sid" - # Debian Installer daily builds - URL="https://d-i.debian.org/daily-images/${LB_ARCHITECTURES}/daily/" + URL="${DAILY_DI_URL}" else URL="${LB_MIRROR_DEBIAN_INSTALLER}/dists/${LB_DEBIAN_INSTALLER_DISTRIBUTION}/main/installer-${LB_ARCHITECTURES}/current/images/" fi @@ -259,8 +261,7 @@ case "${LB_DERIVATIVE}" in then LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION="sid" - # Debian Installer daily builds - URL="https://d-i.debian.org/daily-images/${LB_ARCHITECTURES}/daily/" + URL="${DAILY_DI_URL}" else URL="${LB_PARENT_MIRROR_DEBIAN_INSTALLER}/dists/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}/main/installer-${LB_ARCHITECTURES}/current/images/" fi -- cgit v1.2.3