cadey
/
propellor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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:
Joey Hess 2015-04-29 14:31:54 -04:00
parent cdce8317c7
commit a584268334
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
debian/changelog vendored
View File

@ -7,6 +7,9 @@ propellor (2.4.0) UNRELEASED; urgency=medium
* Merged Utility changes from git-annex. * Merged Utility changes from git-annex.
* Switched from MonadCatchIO-transformers to the newer transformers and * Switched from MonadCatchIO-transformers to the newer transformers and
exceptions libraries. 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 -- Joey Hess <id@joeyh.name> Wed, 22 Apr 2015 20:59:59 -0400

10
src/Propellor/Bootstrap.hs
View File

@ -17,12 +17,10 @@ type ShellCommand = String
-- Should be run inside the propellor config dir, and will install -- Should be run inside the propellor config dir, and will install
-- all necessary build dependencies and build propellor. -- all necessary build dependencies and build propellor.
bootstrapPropellorCommand :: ShellCommand bootstrapPropellorCommand :: ShellCommand
bootstrapPropellorCommand = "if ! test -x ./propellor; then " ++ go ++ "; fi;" ++ checkBinaryCommand bootstrapPropellorCommand = depsCommand ++
where "&& if ! test -x ./propellor; then "
go = intercalate " && " ++ buildCommand ++
[ depsCommand "; fi;" ++ checkBinaryCommand
, buildCommand
]
-- Use propellor --check to detect if the local propellor binary has -- Use propellor --check to detect if the local propellor binary has
-- stopped working (eg due to library changes), and must be rebuilt. -- stopped working (eg due to library changes), and must be rebuilt.