summaryrefslogtreecommitdiff
path: root/src/Propellor/Property/Locale.hs
diff options
context:
space:
mode:
authorJoey Hess2015-12-05 17:53:32 -0400
committerJoey Hess2015-12-05 17:53:32 -0400
commit97a224b194b96184c7938de0bb1e1f423612ccbc (patch)
tree7cc147c4726af8644510c07ba87597920f8301dc /src/Propellor/Property/Locale.hs
parent5c6a43c3b888242443d790efbc1f9282e4e5675c (diff)
parent12548bae3d8feecce6a322162d91b827289ae824 (diff)
Merge branch 'joeyconfig'
Diffstat (limited to 'src/Propellor/Property/Locale.hs')
-rw-r--r--src/Propellor/Property/Locale.hs12
1 files changed, 7 insertions, 5 deletions
diff --git a/src/Propellor/Property/Locale.hs b/src/Propellor/Property/Locale.hs
index c1040780..0342a2f2 100644
--- a/src/Propellor/Property/Locale.hs
+++ b/src/Propellor/Property/Locale.hs
@@ -24,12 +24,12 @@ type LocaleVariable = String
selectedFor :: Locale -> [LocaleVariable] -> RevertableProperty NoInfo
locale `selectedFor` vars = select <!> deselect
where
- select =
- trivial $ cmdProperty "update-locale" selectArgs
+ select = cmdProperty "update-locale" selectArgs
+ `assume` NoChange
`requires` available locale
`describe` (locale ++ " locale selected")
- deselect =
- trivial $ cmdProperty "update-locale" vars
+ deselect = cmdProperty "update-locale" vars
+ `assume` NoChange
`describe` (locale ++ " locale deselected")
selectArgs = zipWith (++) vars (repeat ('=':locale))
@@ -70,4 +70,6 @@ available locale = (ensureAvailable <!> ensureUnavailable)
l `presentIn` ls = any (l `isPrefix`) ls
l `isPrefix` x = (l `isPrefixOf` x) || (("# " ++ l) `isPrefixOf` x)
- regenerate = cmdProperty "dpkg-reconfigure" ["-f", "noninteractive", "locales"]
+ regenerate = cmdProperty "dpkg-reconfigure"
+ ["-f", "noninteractive", "locales"]
+ `assume` MadeChange