[SCM] debian-live branch, master, updated. 1.0_a48-1-98-gea96223

Daniel Baumann daniel at debian.org
Sat Aug 23 22:49:32 UTC 2008


The following commit has been merged in the master branch:
commit c17e023e324e4d395b9fbdd57ccc00f8dd29a05b
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date:   Sun Aug 17 07:06:13 2008 +0100

    Support expanding wildcards in udeb excludes.
    
    This was preventing "kernel-image-*" "exclude" entries from removing these
    packages. This saves about 5 MiB of space in all.
    
    Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>

diff --git a/helpers/lh_binary_debian-installer b/helpers/lh_binary_debian-installer
index cd6f2f6..b352a2a 100755
--- a/helpers/lh_binary_debian-installer
+++ b/helpers/lh_binary_debian-installer
@@ -567,15 +567,15 @@ then
 		cat ../config/binary_debian-installer/udeb_exclude >> exclude
 	fi
 
-	for EXCLUDE in $(cat exclude)
+	while read EXCLUDE
 	do
 		if [ "${LH_DEBIAN_INSTALLER}" = "live" ] && [ "${EXCLUDE}" = "live-installer" ]
 		then
 			continue
 		fi
 
-		rm -f "${EXCLUDE}"_*.udeb
-	done
+		rm -f ${EXCLUDE}_*.udeb
+	done < exclude
 
 	# Enable live-installer
 	if [ "${LH_DEBIAN_INSTALLER}" = "live" ] && [ "${LH_DEBIAN_INSTALLER_DISTRIBUTION}" != "etch" ]

-- 
debian-live



More information about the debian-live-changes mailing list