diff options
| author | Joey Hess <joey@kitenet.net> | 2014-08-19 17:12:57 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-08-19 17:12:57 -0400 |
| commit | d54ee6c336f21212bda28559ec7bac02a11c15a4 (patch) | |
| tree | 2a2dee29f5f40d8c5f49d60bf36e90c5d7a591cd /src | |
| parent | f72a1aa690704b352fa3914514d04438fd0718c0 (diff) | |
color message
Diffstat (limited to 'src')
| -rw-r--r-- | src/wrapper.hs | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/wrapper.hs b/src/wrapper.hs index d3d8f773..9c2f80d1 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 () |
