diff options
author | Joey Hess <joey@kitenet.net> | 2010-10-14 03:18:11 -0400 |
---|---|---|
committer | Joey Hess <joey@kitenet.net> | 2010-10-14 03:18:11 -0400 |
commit | 6f3572e47f57bbe5cc76b58c8bcdc9c6c455dce0 (patch) | |
tree | 4f7f31a703051b9df3986e2a3e7dbfb146e2e032 /git-annex.hs | |
parent | 0b55bd05de7b83a474ea58e9d45676934667f4bd (diff) |
more reorg, spiffed up state monad
Diffstat (limited to 'git-annex.hs')
-rw-r--r-- | git-annex.hs | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/git-annex.hs b/git-annex.hs index 2cf1c5305..ce3b2ac42 100644 --- a/git-annex.hs +++ b/git-annex.hs @@ -6,8 +6,9 @@ import System.IO import System.Environment import Control.Exception import CmdLine -import AbstractTypes -import Annex +import Types +import Commands +import qualified Annex main = do args <- getArgs @@ -30,7 +31,8 @@ tryRun state mode errnum oknum [] = do then error $ (show errnum) ++ " failed ; " ++ show (oknum) ++ " ok" else return () tryRun state mode errnum oknum (f:fs) = do - result <- try (runAnnexState state (dispatch mode f))::IO (Either SomeException ((), AnnexState)) + result <- try + (Annex.run state (dispatch mode f))::IO (Either SomeException ((), AnnexState)) case (result) of Left err -> do showErr err |