summaryrefslogtreecommitdiff
path: root/src/wrapper.hs
diff options
context:
space:
mode:
authorJoey Hess2015-02-28 13:08:05 -0400
committerJoey Hess2015-02-28 13:08:05 -0400
commit970ffbd0d6fbf3ab6ad36f867cfafbcfb2895324 (patch)
treeac15dabe7313a7383569be1384127bb1ce836145 /src/wrapper.hs
parent8777dc2e55068ac6472a4975ef70ceef644407be (diff)
parentec64af82f0f87df939abb6dd0727628a2cd88906 (diff)
Merge branch 'joeyconfig'
Diffstat (limited to 'src/wrapper.hs')
-rw-r--r--src/wrapper.hs12
1 files changed, 5 insertions, 7 deletions
diff --git a/src/wrapper.hs b/src/wrapper.hs
index 304e833d..034eb2bf 100644
--- a/src/wrapper.hs
+++ b/src/wrapper.hs
@@ -15,6 +15,7 @@
module Main where
import Propellor.Message
+import Propellor.Bootstrap
import Utility.UserInfo
import Utility.Monad
import Utility.Process
@@ -91,13 +92,10 @@ wrapper args propellordir propellorbin = do
warnoutofdate propellordir True
buildruncfg = do
changeWorkingDirectory propellordir
- ifM (boolSystem "make" [Param "build"])
- ( do
- putStrLn ""
- putStrLn ""
- chain
- , error "Propellor build failed."
- )
+ buildPropellor
+ putStrLn ""
+ putStrLn ""
+ chain
chain = do
(_, _, _, pid) <- createProcess (proc propellorbin args)
exitWith =<< waitForProcess pid