mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 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
Download patch file Download diff file Expand all files Collapse all files

9
Remote/Helper/Encryptable.hs
View file

@ -32,9 +32,9 @@ encryptionSetup c = case (M.lookup "encryption" c, extractCipher c) of
(Just "shared", Just (EncryptedCipher _ _)) -> cannotchange
(Just _, Just (SharedCipher _)) -> cannotchange
(Just "shared", Nothing) -> use "encryption setup" . genSharedCipher
=<< highRandomQuality
=<< highRandomQuality
(Just keyid, Nothing) -> use "encryption setup" . genEncryptedCipher keyid
=<< highRandomQuality
=<< highRandomQuality
(Just keyid, Just v) -> use "encryption updated" $ updateEncryptedCipher keyid v
where
cannotchange = error "Cannot change encryption type of existing remote."
@ -43,8 +43,9 @@ encryptionSetup c = case (M.lookup "encryption" c, extractCipher c) of
showNote $ m ++ " " ++ describeCipher cipher
return $ M.delete "encryption" $ M.delete "highRandomQuality" $
storeCipher c cipher
highRandomQuality = (&&) (maybe True (/="false") (M.lookup "highRandomQuality" c))
<$> fmap not (Annex.getState Annex.fast)
highRandomQuality =
(&&) (maybe True ( /= "false") $ M.lookup "highRandomQuality" c)
<$> fmap not (Annex.getState Annex.fast)
{- Modifies a Remote to support encryption.
-