summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2015-04-29 14:31:54 -0400
committerJoey Hess2015-04-29 14:31:54 -0400
commita5842683349d6d5f41c46414e1721253f5b4779e (patch)
treeddfdf32d14d149bd8f7b250c3f7e5d59686abbb3
parentcdce8317c707eb3bfc0fd3eb87da65a3d3503db5 (diff)
Ensure build deps are installed before building propellor in --spin and cron job, even if propellor was already built before, to deal with upgrades that add new dependencies.
-rw-r--r--debian/changelog3
-rw-r--r--src/Propellor/Bootstrap.hs10
2 files changed, 7 insertions, 6 deletions
diff --git a/debian/changelog b/debian/changelog
index 592c75a7..5c166f0b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,9 @@ propellor (2.4.0) UNRELEASED; urgency=medium
* Merged Utility changes from git-annex.
* Switched from MonadCatchIO-transformers to the newer transformers and
exceptions libraries.
+ * Ensure build deps are installed before building propellor in --spin
+ and cron job, even if propellor was already built before, to deal with
+ upgrades that add new dependencies.
-- Joey Hess <id@joeyh.name> Wed, 22 Apr 2015 20:59:59 -0400
diff --git a/src/Propellor/Bootstrap.hs b/src/Propellor/Bootstrap.hs
index 3c28edf0..260d8117 100644
--- a/src/Propellor/Bootstrap.hs
+++ b/src/Propellor/Bootstrap.hs
@@ -17,12 +17,10 @@ type ShellCommand = String
-- Should be run inside the propellor config dir, and will install
-- all necessary build dependencies and build propellor.
bootstrapPropellorCommand :: ShellCommand
-bootstrapPropellorCommand = "if ! test -x ./propellor; then " ++ go ++ "; fi;" ++ checkBinaryCommand
- where
- go = intercalate " && "
- [ depsCommand
- , buildCommand
- ]
+bootstrapPropellorCommand = depsCommand ++
+ "&& if ! test -x ./propellor; then "
+ ++ buildCommand ++
+ "; fi;" ++ checkBinaryCommand
-- Use propellor --check to detect if the local propellor binary has
-- stopped working (eg due to library changes), and must be rebuilt.