From 5e9f0a34935957757814ce05c26c42dbc9241ced Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 14 Apr 2015 16:46:06 -0400 Subject: [PATCH] reuse strings --- Messages.hs | 11 ++++++----- Messages/Progress.hs | 3 +-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Messages.hs b/Messages.hs index d8be718cc2..d82eb731b7 100644 --- a/Messages.hs +++ b/Messages.hs @@ -19,6 +19,7 @@ module Messages ( showEndOk, showEndFail, showEndResult, + endResult, showErr, warning, warningIO, @@ -111,11 +112,11 @@ showEndFail :: Annex () showEndFail = showEndResult False showEndResult :: Bool -> Annex () -showEndResult ok = handleMessage (JSON.end ok) $ putStrLn msg - where - msg - | ok = "ok" - | otherwise = "failed" +showEndResult ok = handleMessage (JSON.end ok) $ putStrLn $ endResult ok + +endResult :: Bool -> String +endResult True = "ok" +endResult False = "failed" showErr :: (Show a) => a -> Annex () showErr e = warning' $ "git-annex: " ++ show e diff --git a/Messages/Progress.hs b/Messages/Progress.hs index 64aede5149..9bc3355702 100644 --- a/Messages/Progress.hs +++ b/Messages/Progress.hs @@ -42,8 +42,7 @@ metered combinemeterupdate key af a = case keySize key of , pgTotal = size , pgOnCompletion = do ok <- takeMVar result - putStrLn $ desc ++ " " ++ - if ok then "ok" else "failed" + putStrLn $ desc ++ " " ++ endResult ok } r <- a $ liftIO . pupdate pg