diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2017-12-28 17:29:38 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2017-12-28 17:31:16 -0400 |
| commit | a911948e63d6677a1da7c3000ad5719119d0830a (patch) | |
| tree | bfb229f5a289026be3bc3ccb310dea771fcc216c | |
| parent | 29b1e4c69e96b1dab8ce8ae0579e988b17d33325 (diff) | |
Fix bug introduced in version 6.20171018 that caused some commands to print out "ok" twice after processing a file.
This commit was sponsored by Boyd Stephen Smith Jr. on Patreon
| -rw-r--r-- | CHANGELOG | 2 | ||||
| -rw-r--r-- | CmdLine/Action.hs | 13 |
2 files changed, 11 insertions, 4 deletions
@@ -3,6 +3,8 @@ git-annex (6.20171215) UNRELEASED; urgency=medium * Removed the testsuite build flag; test suite is always included. * Added inprogress command for accessing files as they are being downloaded. + * Fix bug introduced in version 6.20171018 that caused some commands + to print out "ok" twice after processing a file. -- Joey Hess <id@joeyh.name> Wed, 20 Dec 2017 12:11:46 -0400 diff --git a/CmdLine/Action.hs b/CmdLine/Action.hs index 2e0bc2ba2..036f47dd3 100644 --- a/CmdLine/Action.hs +++ b/CmdLine/Action.hs @@ -149,15 +149,20 @@ callCommandAction = fromMaybe True <$$> callCommandAction' {- Like callCommandAction, but returns Nothing when the command did not - perform any action. -} callCommandAction' :: CommandStart -> Annex (Maybe Bool) -callCommandAction' = start +callCommandAction' a = callCommandActionQuiet a >>= \case + Nothing -> return Nothing + Just r -> implicitMessage (showEndResult r) >> return (Just r) + +callCommandActionQuiet :: CommandStart -> Annex (Maybe Bool) +callCommandActionQuiet = start where start = stage $ maybe skip perform perform = stage $ maybe failure cleanup cleanup = stage $ status stage = (=<<) skip = return Nothing - failure = implicitMessage showEndFail >> return (Just False) - status r = implicitMessage (showEndResult r) >> return (Just r) + failure = return (Just False) + status = return . Just {- Do concurrent output when that has been requested. -} allowConcurrentOutput :: Annex a -> Annex a @@ -188,7 +193,7 @@ onlyActionOn k a = onlyActionOn' k run where -- Run whole action, not just start stage, so other threads -- block until it's done. - run = callCommandAction' a >>= \case + run = callCommandActionQuiet a >>= \case Nothing -> return Nothing Just r' -> return $ Just $ return $ Just $ return r' |