From a5842683349d6d5f41c46414e1721253f5b4779e Mon Sep 17 00:00:00 2001
From: Joey Hess <joeyh@joeyh.name>
Date: Wed, 29 Apr 2015 14:31:54 -0400
Subject: [PATCH] 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.

---
 debian/changelog           |  3 +++
 src/Propellor/Bootstrap.hs | 10 ++++------
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 592c75a..5c166f0 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 3c28edf..260d811 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.