From 4e4fb9ab7ca13f5148c6d4b08f53f518429530a8 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 18 Apr 2014 03:59:06 -0400 Subject: get rid of AttrProperty Now both Property and RevertableProperty can influence Attr on their own. --- Propellor/Property/Scheduled.hs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Propellor/Property/Scheduled.hs') diff --git a/Propellor/Property/Scheduled.hs b/Propellor/Property/Scheduled.hs index 769a3931..0e639129 100644 --- a/Propellor/Property/Scheduled.hs +++ b/Propellor/Property/Scheduled.hs @@ -19,7 +19,7 @@ import qualified Data.Map as M -- This uses the description of the Property to keep track of when it was -- last run. period :: Property -> Recurrance -> Property -period prop recurrance = Property desc $ do +period prop recurrance = property desc $ do lasttime <- liftIO $ getLastChecked (propertyDesc prop) nexttime <- liftIO $ fmap startTime <$> nextTime schedule lasttime t <- liftIO localNow @@ -37,7 +37,7 @@ period prop recurrance = Property desc $ do periodParse :: Property -> String -> Property periodParse prop s = case toRecurrance s of Just recurrance -> period prop recurrance - Nothing -> Property "periodParse" $ do + Nothing -> property "periodParse" $ do liftIO $ warningMessage $ "failed periodParse: " ++ s noChange -- cgit v1.2.3