summaryrefslogtreecommitdiff
path: root/src/wrapper.hs
diff options
context:
space:
mode:
authorJoey Hess2014-08-19 17:17:01 -0400
committerJoey Hess2014-08-19 17:17:01 -0400
commit7743da0c3d0a155fb35dbc5d124dba966675da97 (patch)
tree6369f976d0177676b149185c165e00a05523cb6d /src/wrapper.hs
parentfc967dfa4c8568d8fd47e3a9a837421f2acfd245 (diff)
syntax
Diffstat (limited to 'src/wrapper.hs')
-rw-r--r--src/wrapper.hs8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/wrapper.hs b/src/wrapper.hs
index 9c2f80d1..5807cb41 100644
--- a/src/wrapper.hs
+++ b/src/wrapper.hs
@@ -140,12 +140,12 @@ setupupstreammaster newref propellordir = do
error $ "Failed to run " ++ cmd ++ " " ++ show ps
warnoutofdate havebranch = do
- warningMessage"** Your " ++ propellordir ++ " is out of date..")
+ warningMessage ("** Your " ++ propellordir ++ " is out of date..")
let also s = hPutStrLn stderr (" " ++ s)
- also "A newer upstream version is available in " ++ distrepo
+ also ("A newer upstream version is available in " ++ distrepo)
if havebranch
- 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."
+ 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 ()