diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-11-19 17:08:57 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-11-19 17:08:57 -0400 |
| commit | ac540f569f68c910f037e91167f5bd21fb2597f3 (patch) | |
| tree | ea10b56d99c16e80b3ad84e0f0120ccca5b2f8f4 /Command | |
| parent | 75dc5d235e0da1517d6098cd1694286d627fb4b7 (diff) | |
merge with git-repair
Diffstat (limited to 'Command')
| -rw-r--r-- | Command/SendKey.hs | 4 | ||||
| -rw-r--r-- | Command/TransferKey.hs | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/Command/SendKey.hs b/Command/SendKey.hs index 039a3d7ca..24b1821c3 100644 --- a/Command/SendKey.hs +++ b/Command/SendKey.hs @@ -46,6 +46,4 @@ fieldTransfer direction key a = do ok <- maybe (a $ const noop) (\u -> runTransfer (Transfer direction (toUUID u) key) afile noRetry a) =<< Fields.getField Fields.remoteUUID - liftIO $ if ok - then exitSuccess - else exitFailure + liftIO $ exitBool ok diff --git a/Command/TransferKey.hs b/Command/TransferKey.hs index 3270ad8f7..5bb53d98d 100644 --- a/Command/TransferKey.hs +++ b/Command/TransferKey.hs @@ -56,4 +56,4 @@ fromPerform remote key file = go $ getViaTmp key $ \t -> Remote.retrieveKeyFile remote key file t p go :: Annex Bool -> CommandPerform -go a = ifM a ( liftIO exitSuccess, liftIO exitFailure) +go a = a >>= liftIO . exitBool |