cadey
/
propellor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

syntax

This commit is contained in:
Joey Hess 2014-08-19 17:17:01 -04:00
parent fc967dfa4c
commit 7743da0c3d
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/wrapper.hs
View File

@ -140,12 +140,12 @@ setupupstreammaster newref propellordir = do
error $ "Failed to run " ++ cmd ++ " " ++ show ps error $ "Failed to run " ++ cmd ++ " " ++ show ps
warnoutofdate havebranch = do warnoutofdate havebranch = do
warningMessage"** Your " ++ propellordir ++ " is out of date..") warningMessage ("** Your " ++ propellordir ++ " is out of date..")
let also s = hPutStrLn stderr (" " ++ s) 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 if havebranch
then also "To merge it, run: git merge " ++ upstreambranch 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." 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 "" n ""
fetchUpstreamBranch :: FilePath -> FilePath -> IO () fetchUpstreamBranch :: FilePath -> FilePath -> IO ()