chiark-backup's snaprsync sedderies mountpoint out before sums diff.

diff --git a/backup/snaprsync b/backup/snaprsync
index 5cd567a2c3ff9c0df27a70c45c5054d66109c30d..780c68ebe73ad2fb0f0585ff1a3adc4d9a57da25 100755 (executable)
--- a/backup/snaprsync
+++ b/backup/snaprsync
@@ -126,7 +126,8 @@ xwait $lsum
 date -u "+ $datefmt checking"
 
 set +e
 date -u "+ $datefmt checking"
 
 set +e

-diff -u "$localarea,rsums" "$localarea,lsums" >"$localarea,sumsdiff"
+diff -u <(sed -e 's/^mountpoint/dir       /' "$localarea,rsums") \
+  "$localarea,lsums" >"$localarea,sumsdiff"

 diffrc=$?
 set -e
 test $diffrc = 0 || test $diffrc = 1
 diffrc=$?
 set -e
 test $diffrc = 0 || test $diffrc = 1

diff --git a/debian/changelog b/debian/changelog
index 675104afe8d038f5225c13b987cd24580cd0d39b..36e69432a11692efadf1ffad3112d32bebbcab4c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+chiark-utils (4.1.15) unstable; urgency=low
+
+  * chiark-backup's snaprsync sedderies mountpoint out before sums diff.
+
+ --
+

 chiark-utils (4.1.14) unstable; urgency=low
 
   * summer has new -x (one file system) option.
 chiark-utils (4.1.14) unstable; urgency=low
 
   * summer has new -x (one file system) option.