[SCM] live-build branch, debian, updated. debian/3.0_a32-1-2-gf2b6f46

[Daniel Baumann]

The following commit has been merged in the debian branch:
commit c2b7c107a5240b7c03298bfa1c31e67257d5bf20
Author: Daniel Baumann <daniel at debian.org>
Date:   Wed Sep 28 07:09:05 2011 +0200

    Correcting check for debian-installer-distribution when using daily images in non-derivatives mode.

diff --git a/scripts/build/lb_binary_debian-installer b/scripts/build/lb_binary_debian-installer
index 0877518..55691a6 100755
--- a/scripts/build/lb_binary_debian-installer
+++ b/scripts/build/lb_binary_debian-installer
@@ -242,20 +242,32 @@ VMLINUZ_GI="gtk/vmlinuz"
 INITRD_GI="gtk/initrd.gz"
 DESTDIR_GI="${DESTDIR}/gtk"
 
-if [ "${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}" = "daily" ]
-then
-	LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION="sid"
+case "${LB_DERIVATIVE}" in
+	false)
+		if [ "${LB_DEBIAN_INSTALLER_DISTRIBUTION}" = "daily" ]
+		then
+			# FIXME: variable name should be decupled from derivatves
+			LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION="sid"
 
-	# Debian Installer daily builds
-	URL="http://d-i.debian.org/daily-images/${LB_ARCHITECTURES}/daily/"
-else
-	if [ "${LB_DERIVATIVE}" = "true" ]
-	then
-		URL="${LB_MIRROR_DEBIAN_INSTALLER}/dists/${LB_DEBIAN_INSTALLER_DISTRIBUTION}/main/installer-${LB_ARCHITECTURES}/current/images/"
-	else
-		URL="${LB_PARENT_MIRROR_DEBIAN_INSTALLER}/dists/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}/main/installer-${LB_ARCHITECTURES}/current/images/"
-	fi
-fi
+			# Debian Installer daily builds
+			URL="http://d-i.debian.org/daily-images/${LB_ARCHITECTURES}/daily/"
+		else
+			URL="${LB_MIRROR_DEBIAN_INSTALLER}/dists/${LB_DEBIAN_INSTALLER_DISTRIBUTION}/main/installer-${LB_ARCHITECTURES}/current/images/"
+		fi
+		;;
+
+	true)
+		if [ "${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}" = "daily" ]
+		then
+			LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION="sid"
+
+			# Debian Installer daily builds
+			URL="http://d-i.debian.org/daily-images/${LB_ARCHITECTURES}/daily/"
+		else
+			URL="${LB_PARENT_MIRROR_DEBIAN_INSTALLER}/dists/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}/main/installer-${LB_ARCHITECTURES}/current/images/"
+		fi
+		;;
+esac
 
 mkdir -p "${DESTDIR_DI}"
 

-- 
live-build