From 2fc2471b54610392e868966f22e3f57ca7027bf0 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 1 Mar 2017 12:43:15 -0400 Subject: Fix reversion in yesterday's release that made SHA1E and MD5E backends not work. --- CHANGELOG | 7 +++++++ Types/Key.hs | 2 ++ 2 files changed, 9 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index b67d419d0..eb88bd388 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,10 @@ +git-annex (6.20170302) UNRELEASED; urgency=medium + + * Fix reversion in yesterday's release that made SHA1E and MD5E backends + not work. + + -- Joey Hess Wed, 01 Mar 2017 12:41:22 -0400 + git-annex (6.20170301) unstable; urgency=medium * No changes from 6.20170228; a new version number was needed due diff --git a/Types/Key.hs b/Types/Key.hs index 59667ae6d..69ddb1a7c 100644 --- a/Types/Key.hs +++ b/Types/Key.hs @@ -110,7 +110,9 @@ parseKeyVariety "SKEIN512E" = SKEINKey (HashSize 512) (HasExt True) parseKeyVariety "SKEIN256" = SKEINKey (HashSize 256) (HasExt False) parseKeyVariety "SKEIN256E" = SKEINKey (HashSize 256) (HasExt True) parseKeyVariety "SHA1" = SHA1Key (HasExt False) +parseKeyVariety "SHA1E" = SHA1Key (HasExt True) parseKeyVariety "MD5" = MD5Key (HasExt False) +parseKeyVariety "MD5E" = MD5Key (HasExt True) parseKeyVariety "WORM" = WORMKey parseKeyVariety "URL" = URLKey parseKeyVariety s = OtherKey s -- cgit v1.2.3