[SCM] live-build branch, debian, updated. debian/3.0_a18-1-9-gcf8f6ce

[Daniel Baumann]

The following commit has been merged in the debian branch:
commit 25f7152e5eeb6be395790aa433dd350ab2766b97
Author: Daniel Baumann <daniel at debian.org>
Date:   Sat Jun 11 10:59:53 2011 +0200

    Don't try to install standard task on anything but ubuntu.

diff --git a/scripts/build/lb_chroot_tasks b/scripts/build/lb_chroot_tasks
index 477d755..96d02d2 100755
--- a/scripts/build/lb_chroot_tasks
+++ b/scripts/build/lb_chroot_tasks
@@ -64,11 +64,25 @@ then
 	# Installing tasks
 	case "${LB_TASKSEL}" in
 		apt)
+			# This needs to be cleaned up at some point
 			APT_TASKS=
-			for TASK in ${LB_TASKS}
+
+			case "${LB_MODE}" in
+				ubuntu)
+					TASKS="${LB_TASKS}"
+					;;
+
+				*)
+					# Avoid standard tasks which appears to not exist
+					TASKS="$(echo ${LB_TASKS} | sed -e 's|standard||')"
+					;;
+			esac
+
+			for TASK in ${TASKS}
 			do
 				APT_TASKS="${APT_TASKS:+$APT_TASKS }$TASK^"
 			done
+
 			Chroot chroot "apt-get ${APT_OPTIONS} install ${APT_TASKS}"
 			;;
 

-- 
live-build