Merge branch 'joeyconfig'

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 ()