[SCM] live-helper branch, debian-next, updated. debian/2.0_a15-1-2-gb47f19d

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit b47f19d4235a20098a529e5a6a457b37c87213aa
Author: Daniel Baumann <daniel at debian.org>
Date:   Mon Jun 21 22:26:11 2010 +0200

    Correcting wrong handling of --rsyncable in defaults autodetection of gzip options.

diff --git a/functions/defaults.sh b/functions/defaults.sh
index e16635d..c395af0 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -73,12 +73,9 @@ Set_defaults ()
 
 	GZIP_OPTIONS="${GZIP_OPTIONS:---best}"
 
-	if gzip --help | grep -qs "\-\-rsyncable" && \
-	! echo ${GZIP_OPTIONS} | grep -q rsyncable
+	if gzip --help | grep -qs "\-\-rsyncable"
 	then
-		GZIP_OPTIONS="${GZIP_OPTIONS} --rsyncable"
-	else
-		GZIP_OPTIONS="$(echo ${GZIP_OPTIONS} | sed -e 's|--rsyncable||')"
+		GZIP_OPTIONS="$(echo ${GZIP_OPTIONS} | sed -e 's|--rsyncable||') --rsyncable"
 	fi
 
 	# Setting apt recommends

-- 
live-helper