[SCM] live-build branch, debian-next, updated. debian/3.0_a11-1-26-g1109757

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit 11097574ef735eac703a6d96d48a48de80cc5a47
Author: Daniel Baumann <daniel at debian.org>
Date:   Tue Feb 15 11:02:12 2011 +0100

    Correcting udeb download for derivatives to only fall back to debians repository if required to.

diff --git a/scripts/build/lb_binary_debian-installer b/scripts/build/lb_binary_debian-installer
index 568a7fa..36d2391 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
 

-- 
live-build