From 030f13f2d0501c9fb42c8f1efa0a15fa63c94d67 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 6 Dec 2015 14:24:44 -0400 Subject: allow using `check` on a UncheckedProperty, which yields a Property --- src/Propellor/Property/Locale.hs | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'src/Propellor/Property/Locale.hs') diff --git a/src/Propellor/Property/Locale.hs b/src/Propellor/Property/Locale.hs index 29de8df2..a9fb3514 100644 --- a/src/Propellor/Property/Locale.hs +++ b/src/Propellor/Property/Locale.hs @@ -24,15 +24,11 @@ type LocaleVariable = String selectedFor :: Locale -> [LocaleVariable] -> RevertableProperty NoInfo locale `selectedFor` vars = select deselect where - select = check (not <$> isselected) select' + select = check (not <$> isselected) (cmdProperty "update-locale" selectArgs) `requires` available locale `describe` (locale ++ " locale selected") - select' = cmdProperty "update-locale" selectArgs - `assume` MadeChange - deselect = check isselected deselect' + deselect = check isselected (cmdProperty "update-locale" vars) `describe` (locale ++ " locale deselected") - deselect' = cmdProperty "update-locale" vars - `assume` MadeChange selectArgs = zipWith (++) vars (repeat ('=':locale)) isselected = locale `isSelectedFor` vars -- cgit v1.2.3