diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-08-07 13:31:43 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-08-07 13:31:43 -0400 |
| commit | 7e2d07484f2ae9912f34e30e8b5614fb86099eed (patch) | |
| tree | 23606c3d4779317484683daf6d88d05dce6be260 /Command/Get.hs | |
| parent | a66e1f68caeb045dc0c81388076915f5f06bddec (diff) | |
| parent | 2a9077f4e92b588200eafcda4d485e95998917a2 (diff) | |
Merge branch 'master' into assistant
Diffstat (limited to 'Command/Get.hs')
| -rw-r--r-- | Command/Get.hs | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Command/Get.hs b/Command/Get.hs index 95a7040bb..18153ce88 100644 --- a/Command/Get.hs +++ b/Command/Get.hs @@ -65,7 +65,8 @@ getKeyFile key file dest = dispatch =<< Remote.keyPossibilities key | Remote.hasKeyCheap r = either (const False) id <$> Remote.hasKey r key | otherwise = return True - docopy r continue = download (Remote.uuid r) key (Just file) $ do - showAction $ "from " ++ Remote.name r - ifM (Remote.retrieveKeyFile r key (Just file) dest) - ( return True , continue) + docopy r continue = do + ok <- download (Remote.uuid r) key (Just file) $ do + showAction $ "from " ++ Remote.name r + Remote.retrieveKeyFile r key (Just file) dest + if ok then return ok else continue |