[SCM] live-helper branch, upstream, updated. upstream/2.0_a4-1-g37aaf8a

[Daniel Baumann]

The following commit has been merged in the upstream branch:
commit 37aaf8a0a7957c0100f28bd39c91eedecbe13ac5
Author: Daniel Baumann <daniel at debian.org>
Date:   Sat Jan 23 12:51:46 2010 +0100

    Adding upstream version 2.0~a5.

diff --git a/functions/defaults.sh b/functions/defaults.sh
index e45b38f..698dc34 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -284,15 +284,7 @@ Set_defaults ()
 	then
 		case "${LH_MODE}" in
 			debian|debian-release)
-				case "${LH_ARCHITECTURE}" in
-					amd64|i386)
-						LH_MIRROR_BOOTSTRAP="http://ftp.de.debian.org/debian/"
-						;;
-
-					*)
-						LH_MIRROR_BOOTSTRAP="http://ftp.de.debian.org/debian/"
-						;;
-				esac
+				LH_MIRROR_BOOTSTRAP="http://ftp.de.debian.org/debian/"
 				;;
 
 			emdebian)
diff --git a/helpers/lh_binary_rootfs b/helpers/lh_binary_rootfs
index b9c6d26..a862895 100755
--- a/helpers/lh_binary_rootfs
+++ b/helpers/lh_binary_rootfs
@@ -305,6 +305,9 @@ case "${LH_CHROOT_FILESYSTEM}" in
 		# Installing depends
 		Install_package
 
+		Echo_message "Preparing squashfs image..."
+		Echo_message "This may take a while."
+
 		# Remove old squashfs image
 		if [ -f binary/${INITFS}/filesystem.squashfs ]
 		then
diff --git a/helpers/lh_chroot_hooks b/helpers/lh_chroot_hooks
index 04fe487..986aab5 100755
--- a/helpers/lh_chroot_hooks
+++ b/helpers/lh_chroot_hooks
@@ -42,6 +42,12 @@ HOOKS="$(echo ${LH_HOOKS} ${LH_PACKAGES_LISTS} ${LH_TASKS} | sed -e 's| |\n|g' |
 
 for HOOK in ${HOOKS}
 do
+	# Special handling for kde
+	if [ "${HOOK}" = "kde-desktop" ] && [ -n "$(echo ${HOOKS} | grep gnome-desktop)" ]
+	then
+		continue
+	fi
+
 	if [ -f ${LH_BASE:-/usr/share/live-helper}/hooks/"${HOOK}" ]
 	then
 		# Copying hook
diff --git a/helpers/lh_source_debian b/helpers/lh_source_debian
index fef38a4..2668948 100755
--- a/helpers/lh_source_debian
+++ b/helpers/lh_source_debian
@@ -127,7 +127,10 @@ rm -f source-selection.txt
 # Sort sources
 for DSC in chroot/*.dsc
 do
-	SOURCE="$(sed -n 's|^Source: ||p' ${DSC})"
+	SOURCE="$(sed -n 's|^Source: ||p' ${DSC} 2>/dev/null || :)"
+	# The sed may fail if multiple dsc files exist for same source, as the
+	# first one to match will have already been moved.
+	[ -n "$SOURCE" ] || continue
 
 	case "${SOURCE}" in
 		lib?*)

-- 
live-helper