[SCM] live-build branch, debian, updated. debian/3.0_a28-1

[Daniel Baumann]

The following commit has been merged in the debian branch:
commit eedfa8e5ce995c22a6ba25e4cbb700a718c08df6
Author: Daniel Baumann <daniel at debian.org>
Date:   Mon Aug 8 12:37:57 2011 +0200

    Guarding archives handling with an additional check to prevent ugly message about files not existing.

diff --git a/scripts/build/lb_chroot_archives b/scripts/build/lb_chroot_archives
index 5c27c1a..7bbbba7 100755
--- a/scripts/build/lb_chroot_archives
+++ b/scripts/build/lb_chroot_archives
@@ -262,11 +262,14 @@ EOF
 			for FILE in config/archives/*.list \
 				    config/archives/*.list.chroot
 			do
-				sed -e "s|@DISTRIBUTION@|${LB_DISTRIBUTION}|g" \
-				    -e "s|@ARCHIVE_AREAS@|${LB_ARCHIVE_AREAS}|g" \
-				    -e "s|@PARENT_DISTRIBUTION@|${LB_PARENT_DISTRIBUTION}|g" \
-				    -e "s|@PARENT_ARCHIVE_AREAS@|${LB_PARENT_ARCHIVE_AREAS}|g" \
-				"${FILE}" > "chroot/etc/apt/sources.list.d/$(basename ${FILE} .chroot)"
+				if [ -e "${FILE}" ]
+				then
+					sed -e "s|@DISTRIBUTION@|${LB_DISTRIBUTION}|g" \
+					    -e "s|@ARCHIVE_AREAS@|${LB_ARCHIVE_AREAS}|g" \
+					    -e "s|@PARENT_DISTRIBUTION@|${LB_PARENT_DISTRIBUTION}|g" \
+					    -e "s|@PARENT_ARCHIVE_AREAS@|${LB_PARENT_ARCHIVE_AREAS}|g" \
+					"${FILE}" > "chroot/etc/apt/sources.list.d/$(basename ${FILE} .chroot)"
+				fi
 			done
 		fi
 
@@ -785,11 +788,14 @@ EOF
 			for FILE in config/archives/*.list \
 				    config/archives/*.list.binary
 			do
-				sed -e "s|@DISTRIBUTION@|${LB_DISTRIBUTION}|g" \
-				    -e "s|@ARCHIVE_AREAS@|${LB_ARCHIVE_AREAS}|g" \
-				    -e "s|@PARENT_DISTRIBUTION@|${LB_PARENT_DISTRIBUTION}|g" \
-				    -e "s|@PARENT_ARCHIVE_AREAS@|${LB_PARENT_ARCHIVE_AREAS}|g" \
-				"${FILE}" > "chroot/etc/apt/sources.list.d/$(basename ${FILE} .binary)"
+				if [ -e "${FILE}" ]
+				then
+					sed -e "s|@DISTRIBUTION@|${LB_DISTRIBUTION}|g" \
+					    -e "s|@ARCHIVE_AREAS@|${LB_ARCHIVE_AREAS}|g" \
+					    -e "s|@PARENT_DISTRIBUTION@|${LB_PARENT_DISTRIBUTION}|g" \
+					    -e "s|@PARENT_ARCHIVE_AREAS@|${LB_PARENT_ARCHIVE_AREAS}|g" \
+					"${FILE}" > "chroot/etc/apt/sources.list.d/$(basename ${FILE} .binary)"
+				fi
 			done
 		fi
 

-- 
live-build