mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Fix reversion in yesterday's release that made SHA1E and MD5E backends not work.

Browse source
This commit is contained in:
Joey Hess 2017-03-01 12:43:15 -04:00
parent de43d1d407
commit ea1f812ebf
No known key found for this signature in database
GPG key ID: C910D9222512E3C7
2 changed files with 9 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

7
CHANGELOG
View file

@ -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 <id@joeyh.name> Wed, 01 Mar 2017 12:41:22 -0400
git-annex (6.20170301) unstable; urgency=medium git-annex (6.20170301) unstable; urgency=medium
* No changes from 6.20170228; a new version number was needed due * No changes from 6.20170228; a new version number was needed due

2
Types/Key.hs
View file

@ -110,7 +110,9 @@ parseKeyVariety "SKEIN512E" = SKEINKey (HashSize 512) (HasExt True)
parseKeyVariety "SKEIN256" = SKEINKey (HashSize 256) (HasExt False) parseKeyVariety "SKEIN256" = SKEINKey (HashSize 256) (HasExt False)
parseKeyVariety "SKEIN256E" = SKEINKey (HashSize 256) (HasExt True) parseKeyVariety "SKEIN256E" = SKEINKey (HashSize 256) (HasExt True)
parseKeyVariety "SHA1" = SHA1Key (HasExt False) parseKeyVariety "SHA1" = SHA1Key (HasExt False)
parseKeyVariety "SHA1E" = SHA1Key (HasExt True)
parseKeyVariety "MD5" = MD5Key (HasExt False) parseKeyVariety "MD5" = MD5Key (HasExt False)
parseKeyVariety "MD5E" = MD5Key (HasExt True)
parseKeyVariety "WORM" = WORMKey parseKeyVariety "WORM" = WORMKey
parseKeyVariety "URL" = URLKey parseKeyVariety "URL" = URLKey
parseKeyVariety s = OtherKey s parseKeyVariety s = OtherKey s