From 8a50a03cebf83f67ba3f03c33d3145683a0b0c2e Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Wed, 30 May 2007 18:45:45 +0000 Subject: Treat files as ascii when diff'ing. --- localbackupconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'localbackupconfig') diff --git a/localbackupconfig b/localbackupconfig index 43a33ad..33bde0c 100755 --- a/localbackupconfig +++ b/localbackupconfig @@ -3,7 +3,7 @@ # /usr/local/sbin/localbackupconfig # Copyright 2001-2007 Jonas Smedegaard # -# $Id: localbackupconfig,v 1.7 2007-04-04 15:26:31 jonas Exp $ +# $Id: localbackupconfig,v 1.8 2007-05-30 18:45:45 jonas Exp $ # # .dpkg-new files appear when refusing to update a conffile on package update # @@ -108,7 +108,7 @@ for file in $files; do # Only diff against existing and non-empty files. if [ -n "$ext" ] && [ -s "$basedir/$file$ext" ]; then - diff -ruN "$basedir/$file$ext" "$basedir/$file" > "$tempdir/$basedir/$file.diff" || [ $? -lt 2 ] + diff -ruN -a "$basedir/$file$ext" "$basedir/$file" > "$tempdir/$basedir/$file.diff" || [ $? -lt 2 ] chown --reference="$basedir/$file" "$tempdir/$basedir/$file.diff" chmod --reference="$basedir/$file" "$tempdir/$basedir/$file.diff" chmod a-x "$tempdir/$basedir/$file.diff" -- cgit v1.2.3