From ad02c89c6aa6902b9b16375f61df2139e47dfcb3 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 9 Apr 2014 01:15:11 -0400 Subject: update --- Propellor/Property/Scheduled.hs | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'Propellor') diff --git a/Propellor/Property/Scheduled.hs b/Propellor/Property/Scheduled.hs index 2e7ae060..bef2a297 100644 --- a/Propellor/Property/Scheduled.hs +++ b/Propellor/Property/Scheduled.hs @@ -1,5 +1,6 @@ module Propellor.Property.Scheduled ( period + , periodParse , Recurrance(..) , WeekDay , MonthDay @@ -31,7 +32,15 @@ period prop recurrance = Property desc $ do else noChange where schedule = Schedule recurrance AnyTime - desc = propertyDesc prop ++ " (period " ++ show recurrance ++ ")" + desc = propertyDesc prop ++ " (period " ++ fromRecurrance recurrance ++ ")" + +-- | Like period, but parse a human-friendly string. +periodParse :: Property -> String -> Property +periodParse prop s = case toRecurrance s of + Just recurrance -> period prop recurrance + Nothing -> Property "periodParse" $ do + warningMessage $ "failed periodParse: " ++ s + noChange lastCheckedFile :: FilePath lastCheckedFile = localdir ".lastchecked" -- cgit v1.2.3