[SCM] debian-live/live-helper branch, master, updated. 1.0_a40-1-20-gb211016

[Daniel Baumann]

The following commit has been merged in the master branch:
commit b211016196bbe5147cbaa27a39cc17c76ee7b344
Author: Daniel Baumann <daniel at debian.org>
Date:   Tue Mar 25 09:48:34 2008 +0100

    Fixing md5sum.txt creation to not fail on filenames with whitespaces, thanks to Bas Wijnen <wijnen at debian.org> (Closes: #469085).

diff --git a/helpers/lh_binary_md5sum b/helpers/lh_binary_md5sum
index 5ff1b28..03c75d3 100755
--- a/helpers/lh_binary_md5sum
+++ b/helpers/lh_binary_md5sum
@@ -60,7 +60,7 @@ fi
 
 # Calculating md5sums
 cd binary
-find . -type f | sort | grep -v 'isolinux/isolinux.bin' | grep -v 'boot/grub/stage2_eltorito' | xargs -I{} md5sum "{}" > ../md5sum.txt
+find . -type f \! -name 'isolinux/isolinux.bin' \! -name 'boot/grub/stage2_eltorito' -print0 | xargs -0 md5sum > ../md5sum.txt
 
 cat > md5sum.txt << EOF
 This file contains the list of md5 checksums of all files on this medium.
@@ -71,7 +71,7 @@ or, manually with: 'md5sum -c md5sum.txt'.
 
 EOF
 
-cat ../md5sum.txt >> md5sum.txt
+sort ../md5sum.txt >> md5sum.txt
 rm -f ../md5sum.txt
 
 cd "${OLDPWD}"
diff --git a/helpers/lh_source_md5sum b/helpers/lh_source_md5sum
index 00cbba4..ef9c063 100755
--- a/helpers/lh_source_md5sum
+++ b/helpers/lh_source_md5sum
@@ -65,7 +65,7 @@ fi
 
 # Calculating md5sums
 cd source
-find . -type f | sort | xargs md5sum > ../md5sum.txt
+find . -type f -print0 | xargs -0 md5sum > ../md5sum.txt
 
 cat > md5sum.txt << EOF
 This file contains the list of md5 checksums of all files on this medium.
@@ -76,7 +76,7 @@ or, manually with: 'md5sum -c md5sum.txt'.
 
 EOF
 
-cat ../md5sum.txt >> md5sum.txt
+sort ../md5sum.txt >> md5sum.txt
 rm -f ../md5sum.txt
 
 cd "${OLDPWD}"

-- 
debian-live/live-helper