diff options
author | 2010-10-28 12:40:05 -0400 | |
---|---|---|
committer | 2010-10-28 12:40:05 -0400 | |
commit | 045b051ec10023afc2e62895032527d5b5130495 (patch) | |
tree | a438d96566ccebbccf5c1ec1d35e43d2c5097578 /Commands.hs | |
parent | 9c7b3dce9e8f964ed60dd45bca580a46ff8a5ed5 (diff) |
got rid of almost all 'return ()'
Diffstat (limited to 'Commands.hs')
-rw-r--r-- | Commands.hs | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/Commands.hs b/Commands.hs index 6974b697c..a46b9fb16 100644 --- a/Commands.hs +++ b/Commands.hs @@ -14,6 +14,7 @@ import System.Directory import System.Path import Data.String.Utils import Control.Monad (filterM) +import Monad (when) import List import IO @@ -326,9 +327,7 @@ dropKeyCleanup key = do setKeyStart :: FilePath -> Annex (Maybe SubCmdPerform) setKeyStart tmpfile = do keyname <- Annex.flagGet "key" - if (null keyname) - then error "please specify the key with --key" - else return () + when (null keyname) $ error "please specify the key with --key" backends <- Backend.list let key = genKey (backends !! 0) keyname return $ Just $ setKeyPerform tmpfile key @@ -392,9 +391,7 @@ initCleanup = do fromKeyStart :: FilePath -> Annex (Maybe SubCmdPerform) fromKeyStart file = do keyname <- Annex.flagGet "key" - if (null keyname) - then error "please specify the key with --key" - else return () + when (null keyname) $ error "please specify the key with --key" backends <- Backend.list let key = genKey (backends !! 0) keyname |