diff options
| author | Joey Hess <joey@kitenet.net> | 2014-08-19 17:17:05 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-08-19 17:17:05 -0400 |
| commit | bd1af7f39fb8e4b19a5fd2677b221f0e482d5351 (patch) | |
| tree | c61dfc82376edf0b0e2df47ef511cfd6662fd0cf | |
| parent | 9516c4e76b2a6d653091c62a355d7da8ccdc0a57 (diff) | |
| parent | 7743da0c3d0a155fb35dbc5d124dba966675da97 (diff) | |
Merge branch 'joeyconfig'
| -rw-r--r-- | src/wrapper.hs | 8 |
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 () |