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

Merge branch 'joeyconfig'

This commit is contained in:
Joey Hess 2014-08-19 17:16:17 -04:00
parent 16c33945e2 fc967dfa4c
commit 9516c4e76b
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@ -23,7 +23,8 @@ install:
install -d $(DESTDIR)/usr/bin $(DESTDIR)/usr/src/propellor install -d $(DESTDIR)/usr/bin $(DESTDIR)/usr/src/propellor
install -s dist/build/propellor/propellor $(DESTDIR)/usr/bin/propellor install -s dist/build/propellor/propellor $(DESTDIR)/usr/bin/propellor
mkdir -p dist/gittmp mkdir -p dist/gittmp
git archive HEAD | (cd dist/gittmp && tar x) $(CABAL) sdist --list-sources > dist/list-sources
tar c -T dist/list-sources | (cd dist/gittmp && tar x)
cd dist/gittmp && git init && \ cd dist/gittmp && git init && \
git add . \ git add . \
&& git commit -q -m "distributed version of propellor" \ && git commit -q -m "distributed version of propellor" \

11
src/wrapper.hs
View File

@ -14,6 +14,7 @@
module Main where module Main where
import Propellor.Message
import Utility.UserInfo import Utility.UserInfo
import Utility.Monad import Utility.Monad
import Utility.Process import Utility.Process
@ -139,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
let n = hPutStrLn stderr warningMessage"** Your " ++ propellordir ++ " is out of date..")
n ("** Your " ++ propellordir ++ " is out of date..") let also s = hPutStrLn stderr (" " ++ s)
n (" A newer upstream version is available in " ++ distrepo) also "A newer upstream version is available in " ++ distrepo
if havebranch if havebranch
then n (" To merge it, run: git merge " ++ upstreambranch) then also "To merge it, run: git merge " ++ upstreambranch
else n (" 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 ()