diff options
| author | Joey Hess <joeyh@joeyh.name> | 2015-12-06 14:24:44 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-12-06 14:24:44 -0400 |
| commit | 030f13f2d0501c9fb42c8f1efa0a15fa63c94d67 (patch) | |
| tree | f81cbf9524d258daea72ab09866a6a8fe526c827 /src/Propellor/Property/Locale.hs | |
| parent | 94f91a44810dc3a1eca95c843e3c444cbbe87006 (diff) | |
allow using `check` on a UncheckedProperty, which yields a Property
Diffstat (limited to 'src/Propellor/Property/Locale.hs')
| -rw-r--r-- | src/Propellor/Property/Locale.hs | 8 |
1 files changed, 2 insertions, 6 deletions
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 |