summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2007-05-30 18:45:45 +0000
committerJonas Smedegaard <dr@jones.dk>2007-05-30 18:45:45 +0000
commit8a50a03cebf83f67ba3f03c33d3145683a0b0c2e (patch)
tree399237d78232e67c95a70e0da612e8b3307c634e
parentdec34a4a4c602b31d2b02676d3ce8c30f34d145c (diff)
Treat files as ascii when diff'ing.
-rwxr-xr-xlocalbackupconfig4
1 files changed, 2 insertions, 2 deletions
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 <dr@jones.dk>
#
-# $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"