summaryrefslogtreecommitdiff
path: root/Remote
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-05-18 19:30:52 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-05-18 19:36:55 -0400
commit31faff565f6f1d804bd56d5bde380c48467541c8 (patch)
tree36881db777f8c75c84b58524762c64ec4793fc83 /Remote
parent785309b56975ef4f22a5c8fc980cc33ccd0730e2 (diff)
print encryption setup message before action
Diffstat (limited to 'Remote')
-rw-r--r--Remote/Helper/Encryptable.hs5
1 files changed, 3 insertions, 2 deletions
diff --git a/Remote/Helper/Encryptable.hs b/Remote/Helper/Encryptable.hs
index 5c6d70e9b..22e1c9fc0 100644
--- a/Remote/Helper/Encryptable.hs
+++ b/Remote/Helper/Encryptable.hs
@@ -35,12 +35,13 @@ encryptionSetup c = case (M.lookup "encryption" c, extractCipher c) of
=<< highRandomQuality
(Just keyid, Nothing) -> use "encryption setup" . genEncryptedCipher keyid
=<< highRandomQuality
- (Just keyid, Just v) -> use "encryption updated" $ updateEncryptedCipher keyid v
+ (Just keyid, Just v) -> use "encryption update" $ updateEncryptedCipher keyid v
where
cannotchange = error "Cannot change encryption type of existing remote."
use m a = do
+ showNote m
cipher <- liftIO a
- showNote $ m ++ " " ++ describeCipher cipher
+ showNote $ describeCipher cipher
return $ M.delete "encryption" $ M.delete "highRandomQuality" $
storeCipher c cipher
highRandomQuality =