[SCM] live-build branch, debian, updated. debian/3.0_a31-1-16-g0b08f45

Daniel Baumann daniel at debian.org
Tue Sep 27 20:58:57 UTC 2011


The following commit has been merged in the debian branch:
commit dcfbfc8f8b06b29fef31ee06103771ae0d71f62a
Author: Daniel Baumann <daniel at debian.org>
Date:   Wed Sep 14 21:44:04 2011 +0200

    Correcting incomplete checks for local packages in lb_binary_debian-installer.

diff --git a/scripts/build/lb_binary_debian-installer b/scripts/build/lb_binary_debian-installer
index 8527c1a..0877518 100755
--- a/scripts/build/lb_binary_debian-installer
+++ b/scripts/build/lb_binary_debian-installer
@@ -446,7 +446,7 @@ then
 	fi
 
 	# Including local debs
-	if Find_files config/packages.binary/*_"${LB_ARCHITECTURES}".deb || config/packages/*_"${LB_ARCHITECTURES}".deb
+	if Find_files config/packages.binary/*_"${LB_ARCHITECTURES}".deb || Find_files config/packages/*_"${LB_ARCHITECTURES}".deb
 	then
 		for FILE in config/packages.binary/*_"${LB_ARCHITECTURES}".deb config/packages/*_"${LB_ARCHITECTURES}".deb
 		do
@@ -457,7 +457,7 @@ then
 		done
 	fi
 
-	if Find_files config/packages.binary/*_all.deb || config/packages/*_all.deb
+	if Find_files config/packages.binary/*_all.deb || Find_files config/packages/*_all.deb
 	then
 		for FILE in config/packages.binary/*_all.deb config/packages/*_all.deb
 		do

-- 
live-build



More information about the debian-live-changes mailing list