summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Propellor/DotDir.hs17
1 files changed, 9 insertions, 8 deletions
diff --git a/src/Propellor/DotDir.hs b/src/Propellor/DotDir.hs
index 39c111f6..be5d614d 100644
--- a/src/Propellor/DotDir.hs
+++ b/src/Propellor/DotDir.hs
@@ -454,11 +454,12 @@ updateUpstreamMaster newref = do
-- that does not point at the distrepo, the user must have set that up
-- and is not using the distrepo, so do nothing.
warnoutofdate :: Bool -> IO ()
-warnoutofdate havebranch = do
- warningMessage ("** Your ~/.propellor/ is out of date..")
- let also s = infoMessage [" " ++ s]
- 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.")
- also ""
+warnoutofdate havebranch = warningMessage $ unlines
+ [ "** Your ~/.propellor/ is out of date.."
+ , indent "A newer upstream version is available in " ++ distrepo
+ , indent $ if havebranch
+ then "To merge it, run: git merge " ++ upstreambranch
+ else "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."
+ ]
+ where
+ indent s = " " ++ s