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

print encryption setup message before action

Browse source
This commit is contained in:
Joey Hess 2013-05-18 19:30:52 -04:00
parent 5482a7b505
commit 667a832de9
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Remote/Helper/Encryptable.hs
View file

@ -35,12 +35,13 @@ encryptionSetup c = case (M.lookup "encryption" c, extractCipher c) of
=<< highRandomQuality =<< highRandomQuality
(Just keyid, Nothing) -> use "encryption setup" . genEncryptedCipher keyid (Just keyid, Nothing) -> use "encryption setup" . genEncryptedCipher keyid
=<< highRandomQuality =<< highRandomQuality
(Just keyid, Just v) -> use "encryption updated" $ updateEncryptedCipher keyid v (Just keyid, Just v) -> use "encryption update" $ updateEncryptedCipher keyid v
where where
cannotchange = error "Cannot change encryption type of existing remote." cannotchange = error "Cannot change encryption type of existing remote."
use m a = do use m a = do
showNote m
cipher <- liftIO a cipher <- liftIO a
showNote $ m ++ " " ++ describeCipher cipher showNote $ describeCipher cipher
return $ M.delete "encryption" $ M.delete "highRandomQuality" $ return $ M.delete "encryption" $ M.delete "highRandomQuality" $
storeCipher c cipher storeCipher c cipher
highRandomQuality = highRandomQuality =