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

cron.runPropellor now runs propellor, rather than using its Makefile. This is more robust. 

Particularly, the Makefile would try to build propellor if there were
updates, but if this build failed because a bad commit was pushed, it would
abort w/o pulling any new fixed commits.

Anyway, it's better to move away from using the makefile when possible as
it's just for bootstrapping, and also I would like to make "make" not
default to running propellor as that can be confusing behavior.

(I can't change that yet; needed for upgrades. Should be fine to change
after several more releases, or maybe a year..)
This commit is contained in:
Joey Hess 2014-11-25 11:30:52 -04:00
parent 934171e2ea
commit 40374c10de
Failed to extract signature
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian/changelog vendored
View File

@ -17,6 +17,8 @@ propellor (1.1.0) UNRELEASED; urgency=medium
use hasSomePassword' and hasPassword' (API change)
* Add --merge, to combine multiple --spin commits into a single, more useful
commit.
* cron.runPropellor now runs propellor, rather than using its Makefile.
This is more robust.
-- Joey Hess <joeyh@debian.org> Sat, 22 Nov 2014 00:12:35 -0400

2
src/Propellor/Property/Cron.hs
View File

@ -58,4 +58,4 @@ niceJob desc times user cddir command = job desc times user cddir
-- | Installs a cron job to run propellor.
runPropellor :: CronTimes -> Property
runPropellor times = niceJob "propellor" times "root" localdir "make"
runPropellor times = niceJob "propellor" times "root" localdir "./propellor"