[SCM] live-build branch, debian-next, updated. debian/3.0_a42-1-12-g4b5a89b

Daniel Baumann daniel at debian.org
Sat Feb 4 17:35:34 UTC 2012


The following commit has been merged in the debian-next branch:
commit 4b5a89b901ed999887e937a3158f0f0860039254
Author: Daniel Baumann <daniel at debian.org>
Date:   Sat Feb 4 18:35:02 2012 +0100

    Avoid warning messages in binary_packagelists for not existing local lists.

diff --git a/scripts/build/lb_binary_packagelists b/scripts/build/lb_binary_packagelists
index 5f2c64b..6f2ffc7 100755
--- a/scripts/build/lb_binary_packagelists
+++ b/scripts/build/lb_binary_packagelists
@@ -57,14 +57,17 @@ then
 	for LIST in config/package-lists/*.list \
 		    config/package-lists/*.list.binary
 	do
-		# Generate package list
-		Expand_packagelist "${LIST}" "config/package-lists" > chroot/root/"$(basename ${LIST})"
+		if [ -e "${LIST}" ]
+		then
+			# Generate package list
+			Expand_packagelist "${LIST}" "config/package-lists" > chroot/root/"$(basename ${LIST})"
 
-		# Downloading additional packages
-		Chroot chroot "xargs --arg-file=/root/$(basename ${LIST}) apt-get ${APT_OPTIONS} -o Dir::Cache=/binary.deb --download-only install"
+			# Downloading additional packages
+			Chroot chroot "xargs --arg-file=/root/$(basename ${LIST}) apt-get ${APT_OPTIONS} -o Dir::Cache=/binary.deb --download-only install"
 
-		# Remove package list
-		rm chroot/root/"$(basename ${LIST})"
+			# Remove package list
+			rm chroot/root/"$(basename ${LIST})"
+		fi
 	done
 
 	for FILE in chroot/binary.deb/archives/*.deb

-- 
live-build



More information about the debian-live-changes mailing list