From 97f30b490755c558c696d8297c96d40d86672259 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel@debian.org>
Date: Tue, 15 Feb 2011 11:02:12 +0100
Subject: Correcting udeb download for derivatives to only fall back to debians
 repository if required to.

---
 scripts/build/lb_binary_debian-installer | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'scripts')

diff --git a/scripts/build/lb_binary_debian-installer b/scripts/build/lb_binary_debian-installer
index 568a7fa03..36d239133 100755
--- a/scripts/build/lb_binary_debian-installer
+++ b/scripts/build/lb_binary_debian-installer
@@ -506,13 +506,13 @@ then
 	fi
 
 	# Sorting udebs
-	UDEBS="$(awk '/Filename: / { print $2 }' Packages)"
-
 	if [ "${LB_DERIVATIVE}" = true ]
 	then
-		UDEBS="${UDEBS} $(awk '/Filename: / { print $2 }' Packages.derivative)"
+		UDEBS="$(awk '/Filename: / { print $2 }' Packages.derivative)"
 	fi
 
+	UDEBS="${UDEBS} $(awk '/Filename: / { print $2 }' Packages)"
+
 	# Downloading udebs
 	for UDEB in ${UDEBS}
 	do
@@ -522,7 +522,10 @@ then
 			cp ../cache/packages_debian-installer.udeb/"$(basename ${UDEB})" ./
 		else
 			# Downloading udebs
-			wget ${WGET_OPTIONS} "${LB_MIRROR_CHROOT}"/${UDEB} || wget ${WGET_OPTIONS} "${LB_PARENT_MIRROR_CHROOT}"/${UDEB}
+			if ! ls "$(basename ${UDEB} | awk -F_ '{ print $1 }')"_* > /dev/null 2>&1
+			then
+				wget ${WGET_OPTIONS} "${LB_MIRROR_CHROOT}"/${UDEB} || wget ${WGET_OPTIONS} "${LB_PARENT_MIRROR_CHROOT}"/${UDEB}
+			fi
 		fi
 	done
 
-- 
cgit v1.2.3