From b728b0eb764dce8493eaf3f6c661e6aafcdc042f Mon Sep 17 00:00:00 2001
From: Lars Wirzenius <liw@liw.fi>
Date: Sat, 25 Mar 2017 18:33:45 +0200
Subject: Force summain checksum algorithm

Summain default has changed, so to be compatible with old
summain output files, we have to force the checksum algorithm to what
the old default was.
---
 yarns/0200-repo-formats.yarn | 1 +
 yarns/obnam.sh               | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'yarns')

diff --git a/yarns/0200-repo-formats.yarn b/yarns/0200-repo-formats.yarn
index 646fe58a..713cdebf 100644
--- a/yarns/0200-repo-formats.yarn
+++ b/yarns/0200-repo-formats.yarn
@@ -99,6 +99,7 @@ against the manifest.
     done
     summain -r --exclude=Ino --exclude=Dev --exclude=Uid \
         --exclude=Username --exclude=Gid --exclude=Group \
+        --checksum=SHA1 \
         . | normalise_manifest_times > "$DATADIR/restored-manifest"
     normalise_manifest_times "$DATADIR/$MATCH_2" \
         > "$DATADIR/original-manifest"
diff --git a/yarns/obnam.sh b/yarns/obnam.sh
index 389f44d8..3c855f5e 100644
--- a/yarns/obnam.sh
+++ b/yarns/obnam.sh
@@ -173,7 +173,7 @@ remove_nlink_for_directories()
 
 manifest()
 {
-    summain -r "$1" --exclude Ino --exclude Dev |
+    summain -r "$1" --exclude Ino --exclude Dev -c SHA1 |
     normalise_manifest_times |
     remove_nlink_for_directories
 }
-- 
cgit v1.2.1