summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2014-11-25 11:30:52 -0400
committerJoey Hess2014-11-25 11:33:45 -0400
commit40374c10de68217344c55d23b597d4dc777bdfc9 (patch)
treefbd3919e6df736ed646035d00c3e6e55dfb18bb2
parent934171e2ea774da4999b14a71b23dab639ff5f41 (diff)
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..)
-rw-r--r--debian/changelog2
-rw-r--r--src/Propellor/Property/Cron.hs2
2 files changed, 3 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 683fed21..8d0c9316 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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
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"