diff options
| author | Joey Hess <joeyh@joeyh.name> | 2016-03-07 17:05:25 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-03-07 17:05:25 -0400 |
| commit | 4a7b19ea49923de05aca639816d27dc184cdb25a (patch) | |
| tree | 6da836d12928daa43689e8e07f9e500b15c7fae0 /src/Propellor/Bootstrap.hs | |
| parent | a654b64ac5d466039494673c5e829c94a3902ce2 (diff) | |
make Cron.runPropellor pass System to bootstrapPropellorCommand
Rather than having the property fail when the Host has no OS defined,
I made bootstrapPropellorCommand not install deps in this situation.
The cron job will (probably) still work, unless a system upgrade causes
deps to be removed.
Diffstat (limited to 'src/Propellor/Bootstrap.hs')
| -rw-r--r-- | src/Propellor/Bootstrap.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Propellor/Bootstrap.hs b/src/Propellor/Bootstrap.hs index 58480832..633a2ff4 100644 --- a/src/Propellor/Bootstrap.hs +++ b/src/Propellor/Bootstrap.hs @@ -15,8 +15,8 @@ type ShellCommand = String -- Shell command line to ensure propellor is bootstrapped and ready to run. -- Should be run inside the propellor config dir, and will install -- all necessary build dependencies and build propellor. -bootstrapPropellorCommand :: System -> ShellCommand -bootstrapPropellorCommand sys = checkDepsCommand sys ++ +bootstrapPropellorCommand :: Maybe System -> ShellCommand +bootstrapPropellorCommand msys = maybe "true" checkDepsCommand msys ++ "&& if ! test -x ./propellor; then " ++ buildCommand ++ "; fi;" ++ checkBinaryCommand |