summaryrefslogtreecommitdiff
path: root/src/Propellor/DotDir.hs
diff options
context:
space:
mode:
authorJoey Hess <joeyh@joeyh.name>2018-01-02 12:36:18 -0400
committerJoey Hess <joeyh@joeyh.name>2018-01-02 12:36:18 -0400
commite6f4144824c4a589f6241299d5c9508ffb805db5 (patch)
treeaac5116981cbdc99fd077f925024bc7368946e94 /src/Propellor/DotDir.hs
parent7d13e0da8ed9c7dbfb3e1edfb2870e0855c82cf5 (diff)
parentdf67ff0ad827c6d2db63e79f342106022716bd90 (diff)
Merge branch 'joeyconfig'
Diffstat (limited to 'src/Propellor/DotDir.hs')
-rw-r--r--src/Propellor/DotDir.hs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Propellor/DotDir.hs b/src/Propellor/DotDir.hs
index f42c0575..e9253b87 100644
--- a/src/Propellor/DotDir.hs
+++ b/src/Propellor/DotDir.hs
@@ -427,7 +427,7 @@ setupUpstreamMaster newref = do
warnoutofdate :: Bool -> IO ()
warnoutofdate havebranch = do
warningMessage ("** Your ~/.propellor/ is out of date..")
- let also s = hPutStrLn stderr (" " ++ s)
+ 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)