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

changelog & minor style fixes

Browse source
This commit is contained in:
Joey Hess 2013-04-06 16:14:57 -04:00
parent 00fc21bfec
commit c511eb048f
2 changed files with 10 additions and 4 deletions
Remote/Helper
Encryptable.hs
debian
changelog

3
Remote/Helper/Encryptable.hs
View file

@ -43,7 +43,8 @@ encryptionSetup c = case (M.lookup "encryption" c, extractCipher c) of
showNote $ m ++ " " ++ describeCipher cipher showNote $ m ++ " " ++ describeCipher cipher
return $ M.delete "encryption" $ M.delete "highRandomQuality" $ return $ M.delete "encryption" $ M.delete "highRandomQuality" $
storeCipher c cipher storeCipher c cipher
highRandomQuality = (&&) (maybe True (/="false") (M.lookup "highRandomQuality" c)) highRandomQuality =
(&&) (maybe True ( /= "false") $ M.lookup "highRandomQuality" c)
<$> fmap not (Annex.getState Annex.fast) <$> fmap not (Annex.getState Annex.fast)
{- Modifies a Remote to support encryption. {- Modifies a Remote to support encryption.

5
debian/changelog vendored
View file

@ -1,5 +1,10 @@
git-annex (4.20130406) UNRELEASED; urgency=low git-annex (4.20130406) UNRELEASED; urgency=low
* initremote: Generates encryption keys with high quality entropy.
This can be disabled using --fast to get the old behavior.
The assistant still uses low-quality entropy when creating encrypted
remotes, to avoid delays.
Thanks, guilhem for the patch.
* Bugfix: Direct mode no longer repeatedly checksums duplicated files. * Bugfix: Direct mode no longer repeatedly checksums duplicated files.
-- Joey Hess <joeyh@debian.org> Sat, 06 Apr 2013 15:24:15 -0400 -- Joey Hess <joeyh@debian.org> Sat, 06 Apr 2013 15:24:15 -0400