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.
This commit is contained in:
parent
cdce8317c7
commit
a584268334
|
@ -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
|
||||
|
||||
|
|
|
@ -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.
|
||||
|
|
Loading…
Reference in New Issue