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.

6 files changed, 9 insertions, 5 deletions

diff --git a/create-reference-repo b/create-reference-repo
index af93b376..38ba1fb0 100755
--- a/create-reference-repo
+++ b/create-reference-repo
@@ -99,6 +99,7 @@ class CreateReferenceRepository(cliapp.Application):
         cliapp.runcmd(
             ['summain', '--exclude=Ino', '--exclude=Dev', '--exclude=Uid',
              '--exclude=Username', '--exclude=Gid', '--exclude=Group',
+             '--checksum=SHA1',
              '-r', '--output', manifest_name, dirname])
 
     def backup(self, live_dir, repo_dir):
diff --git a/manual/format-de-pdf b/manual/format-de-pdf
index 36ef4e75..15ef78eb 100755
--- a/manual/format-de-pdf
+++ b/manual/format-de-pdf
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Copyright 2014,2016  Lars Wirzenius
-# Copyright 2014  Jan Niggemann
+# Copyright 2014,2017  Jan Niggemann
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/obnamlib/plugins/show_plugin.py b/obnamlib/plugins/show_plugin.py
index 79ccde10..3556f62f 100644
--- a/obnamlib/plugins/show_plugin.py
+++ b/obnamlib/plugins/show_plugin.py
@@ -1,4 +1,5 @@
 # Copyright (C) 2009-2016  Lars Wirzenius
+# Copyright (C) 2017  SanskritFritz
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/verification-test b/verification-test
index 04a475d6..037aaea8 100755
--- a/verification-test
+++ b/verification-test
@@ -34,7 +34,7 @@
 # fail even though Obnam was working ine: it's just that some file changed
 # between Obnam backing it up and summain including it in the manifest.
 #
-# Copyright 2011-2014  Lars Wirzenius
+# Copyright 2011-2014,2017  Lars Wirzenius
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -76,7 +76,7 @@ backup()
     then
         die "gen is empty"
     fi
-    summain "$dir" -r --output="$repo/$client.$gen.summain"
+    summain "$dir" -r --output="$repo/$client.$gen.summain" -c SHA1
 }
 
 abspath()
@@ -103,7 +103,8 @@ verify()
         ./obnam --no-default-configs --config="$conf" \
             restore --to="$tempdir/$gen" --generation="$gen" || \
             exit 42
-        summain "$tempdir/$gen/$dir" -r --output="$tempdir/summain.$gen"
+        summain "$tempdir/$gen/$dir" -r --output="$tempdir/summain.$gen" \
+                -c SHA1
         if ! diff -u "$repo/$client.$gen.summain" "$tempdir/summain.$gen"
         then
             die "generation $gen failed to restore properly, see $tempdir"
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
 }