From d54ee6c336f21212bda28559ec7bac02a11c15a4 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 19 Aug 2014 17:12:57 -0400 Subject: [PATCH] color message --- src/wrapper.hs | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/wrapper.hs b/src/wrapper.hs index d3d8f77..9c2f80d 100644 --- a/src/wrapper.hs +++ b/src/wrapper.hs @@ -14,6 +14,7 @@ module Main where +import Propellor.Message import Utility.UserInfo import Utility.Monad import Utility.Process @@ -139,12 +140,12 @@ setupupstreammaster newref propellordir = do error $ "Failed to run " ++ cmd ++ " " ++ show ps warnoutofdate havebranch = do - let n = hPutStrLn stderr - n ("** Your " ++ propellordir ++ " is out of date..") - n (" A newer upstream version is available in " ++ distrepo) + warningMessage"** Your " ++ propellordir ++ " is out of date..") + let also s = hPutStrLn stderr (" " ++ s) + also "A newer upstream version is available in " ++ distrepo if havebranch - then n (" To merge it, run: git merge " ++ upstreambranch) - else n (" To merge it, find the most recent commit in your repository's history that corresponds to an upstream release of propellor, and set refs/remotes/" ++ upstreambranch ++ " to it. Then run propellor again." ) + then also "To merge it, run: git merge " ++ upstreambranch + else also "To merge it, find the most recent commit in your repository's history that corresponds to an upstream release of propellor, and set refs/remotes/" ++ upstreambranch ++ " to it. Then run propellor again." n "" fetchUpstreamBranch :: FilePath -> FilePath -> IO ()