From 40374c10de68217344c55d23b597d4dc777bdfc9 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 25 Nov 2014 11:30:52 -0400 Subject: 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..) --- src/Propellor/Property/Cron.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/Propellor') diff --git a/src/Propellor/Property/Cron.hs b/src/Propellor/Property/Cron.hs index d55c3dbb..26cf312f 100644 --- a/src/Propellor/Property/Cron.hs +++ b/src/Propellor/Property/Cron.hs @@ -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" -- cgit v1.2.3