[SCM] live-build branch, debian-next, updated. debian/3.0_a48-1-14-geeb9f48

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit eeb9f4896ef3fe795fd114c4fbb6bada5bc2fe45
Author: Daniel Baumann <daniel at debian.org>
Date:   Mon Jun 4 10:41:57 2012 +0200

    Making firmware package assembling a bit more robust.

diff --git a/scripts/build/lb_binary_debian-installer b/scripts/build/lb_binary_debian-installer
index 1ea4854..8181c52 100755
--- a/scripts/build/lb_binary_debian-installer
+++ b/scripts/build/lb_binary_debian-installer
@@ -423,6 +423,8 @@ then
 		# Filter out contrib packages if contrib is not enabled
 		if ! echo ${LB_ARCHIVE_AREAS} | grep -qs contrib
 		then
+			_FIRMWARE_PACKAGES=""
+
 			for _PACKAGE in ${FIRMWARE_PACKAGES}
 			do
 				_FIRMWARE_PACKAGES="${_FIRMWARE_PACKAGES} $(echo ${_PACKAGE} | grep -v '^contrib/')"
@@ -434,6 +436,8 @@ then
 		# Filter out non-free packages if non-free is not enabled
 		if ! echo ${LB_ARCHIVE_AREAS} | grep -qs non-free
 		then
+			_FIRMWARE_PACKAGES=""
+
 			for _PACKAGE in ${FIRMWARE_PACKAGES}
 			do
 				_FIRMWARE_PACKAGES="${_FIRMWARE_PACKAGES} $(echo ${_PACKAGE} | grep -v '^non-free/')"

-- 
live-build