From 575648476f5ae8316d26b6107d403400f8ad35e5 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel@debian.org>
Date: Mon, 21 Jun 2010 22:26:11 +0200
Subject: Correcting wrong handling of --rsyncable in defaults autodetection of
 gzip options.

---
 functions/defaults.sh | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

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
-- 
cgit v1.0