[SCM] live-helper branch, debian-next, updated. debian/2.0_a8-1-51-gf5d73d4

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit f5d73d4c29e35fb4a77a75b10c36b43ad667d8d5
Author: Daniel Baumann <daniel at debian.org>
Date:   Sat Mar 13 15:46:06 2010 +0100

    Avoid double building source images in autobuild script.

diff --git a/examples/cron/images.sh b/examples/cron/images.sh
index 5d6d920..cf76198 100755
--- a/examples/cron/images.sh
+++ b/examples/cron/images.sh
@@ -126,11 +126,10 @@ do
 			--mirror-chroot-security ${MIRROR_SECURITY} \
 			${PACKAGES} \
 			--packages-lists ${FLAVOUR} \
-			--source ${SOURCE} \
 			--tasksel ${TASKSEL} ${KERNEL}
 
 		# TEMPORARY HACK until memtest86+ maintainers fixes his package
-		if [ ${FLAVOUR} = rescue ]
+		if [ ${DISTRIBUTION} = "squeeze" ] && [ ${FLAVOUR} = rescue ]
 		then
 			lh config --memtest none
 		fi
@@ -141,12 +140,6 @@ do
 		mv binary.list debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${FLAVOUR}.iso.list
 		mv binary.packages debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${FLAVOUR}.iso.packages
 
-		if [ "${SOURCE}" = "true" ]
-		then
-			mv source.tar.gz debian-live-${DISTRIBUTION}-source-${FLAVOUR}.tar.gz
-			mv source.list debian-live-${DISTRIBUTION}-source-${FLAVOUR}.tar.gz.list
-		fi
-
 		if [ "${DISTRIBUTION}" = "lenny" ]
 		then
 			lh clean --binary
@@ -169,5 +162,15 @@ do
 		mv binary.packages debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${FLAVOUR}-net.tar.gz.packages
 
 		mv binary/*/filesystem.squashfs debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${FLAVOUR}.squashfs
+
+		if [ "${SOURCE}" = "true" ]
+		then
+			lh config --source true
+
+			lh source 2>&1 | tee debian-live-${DISTRIBUTION}-source-${FLAVOUR}.tar.gz.log
+
+			mv source.tar.gz debian-live-${DISTRIBUTION}-source-${FLAVOUR}.tar.gz
+			mv source.list debian-live-${DISTRIBUTION}-source-${FLAVOUR}.tar.gz.list
+		fi
 	done
 done

-- 
live-helper