summaryrefslogtreecommitdiff
path: root/Core.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2010-10-25 19:17:11 -0400
committerGravatar Joey Hess <joey@kitenet.net>2010-10-25 19:17:11 -0400
commite87287c11b81ea6f339628bcbebfb239d0ccadd0 (patch)
tree7ee01405715834e473b9874b9eeb87968d5d0d65 /Core.hs
parent47892ced883b96c3a9c2903aa8a59b3b8a2f1731 (diff)
fix failure propigation
Diffstat (limited to 'Core.hs')
-rw-r--r--Core.hs7
1 files changed, 5 insertions, 2 deletions
diff --git a/Core.hs b/Core.hs
index 8717aee81..0d95e382b 100644
--- a/Core.hs
+++ b/Core.hs
@@ -18,14 +18,15 @@ import qualified Annex
import Utility
{- Sets up a git repo for git-annex. -}
-startup :: Annex ()
+startup :: Annex Bool
startup = do
g <- Annex.gitRepo
liftIO $ gitAttributes g
prepUUID
+ return True
{- When git-annex is done, it runs this. -}
-shutdown :: Annex ()
+shutdown :: Annex Bool
shutdown = do
g <- Annex.gitRepo
@@ -38,6 +39,8 @@ shutdown = do
then liftIO $ removeDirectoryRecursive $ tmp
else return ()
+ return True
+
{- configure git to use union merge driver on state files, if it is not
- already -}
gitAttributes :: Git.Repo -> IO ()