Run shutdown cleanup actions even if there were failures processing the command.

Amoung other fixes, this means that addurl will stage added files even if
adding one of the urls fails.
This commit is contained in:
Joey Hess 2014-12-30 12:49:34 -04:00
parent cdc69d7477
commit e9a5e4d6c6
3 changed files with 10 additions and 6 deletions

View file

@ -53,8 +53,8 @@ dispatch fuzzyok allargs allcmds commonoptions fields header getgitrepo = do
whenM (annexDebug <$> Annex.getGitConfig) $
liftIO enableDebugOutput
startup
performCommandAction cmd params
shutdown $ cmdnocommit cmd
performCommandAction cmd params $
shutdown $ cmdnocommit cmd
go _flags params (Left e) = do
when fuzzy $
autocorrect =<< Git.Config.global

View file

@ -17,13 +17,14 @@ import qualified Annex.Queue
type CommandActionRunner = CommandStart -> CommandCleanup
{- Runs a command, starting with the check stage, and then
- the seek stage. Finishes by printing the number of commandActions that
- failed. -}
performCommandAction :: Command -> CmdParams -> Annex ()
performCommandAction Command { cmdseek = seek, cmdcheck = c, cmdname = name } params = do
- the seek stage. Finishes by running the continutation, and
- then showing a count of any failures. -}
performCommandAction :: Command -> CmdParams -> Annex () -> Annex ()
performCommandAction Command { cmdseek = seek, cmdcheck = c, cmdname = name } params cont = do
mapM_ runCheck c
Annex.changeState $ \s -> s { Annex.errcounter = 0 }
seek params
cont
showerrcount =<< Annex.getState Annex.errcounter
where
showerrcount 0 = noop

3
debian/changelog vendored
View file

@ -4,6 +4,9 @@ git-annex (5.20141220) UNRELEASED; urgency=medium
* Work around statfs() overflow on some XFS systems.
* sync: Now supports remote groups, the same way git remote update does.
* setpresentkey: A new plumbing-level command.
* Run shutdown cleanup actions even if there were failures processing
the command. Amoung other fixes, this means that addurl will stage
added files even if adding one of the urls fails.
-- Joey Hess <id@joeyh.name> Mon, 22 Dec 2014 15:16:38 -0400