summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2014-08-19 17:16:17 -0400
committerJoey Hess2014-08-19 17:16:17 -0400
commit9516c4e76b2a6d653091c62a355d7da8ccdc0a57 (patch)
tree8de1db69785367c9bb0e355ee384034bc7504a72
parent16c33945e29a3d9fdd908ada0dbb63eda9ba44fa (diff)
parentfc967dfa4c8568d8fd47e3a9a837421f2acfd245 (diff)
Merge branch 'joeyconfig'
-rw-r--r--Makefile3
-rw-r--r--src/wrapper.hs11
2 files changed, 8 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index ca89b5bb..6bff03d0 100644
--- a/Makefile
+++ b/Makefile
@@ -23,7 +23,8 @@ install:
install -d $(DESTDIR)/usr/bin $(DESTDIR)/usr/src/propellor
install -s dist/build/propellor/propellor $(DESTDIR)/usr/bin/propellor
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 && \
git add . \
&& git commit -q -m "distributed version of propellor" \
diff --git a/src/wrapper.hs b/src/wrapper.hs
index d3d8f773..9c2f80d1 100644
--- a/src/wrapper.hs
+++ b/src/wrapper.hs
@@ -14,6 +14,7 @@
module Main where
+import Propellor.Message
import Utility.UserInfo
import Utility.Monad
import Utility.Process
@@ -139,12 +140,12 @@ setupupstreammaster newref propellordir = do
error $ "Failed to run " ++ cmd ++ " " ++ show ps
warnoutofdate havebranch = do
- let n = hPutStrLn stderr
- n ("** Your " ++ propellordir ++ " is out of date..")
- n (" A newer upstream version is available in " ++ distrepo)
+ warningMessage"** Your " ++ propellordir ++ " is out of date..")
+ let also s = hPutStrLn stderr (" " ++ s)
+ also "A newer upstream version is available in " ++ distrepo
if havebranch
- then n (" 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." )
+ 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 ()