summaryrefslogtreecommitdiff
path: root/src/Propellor/Property/Locale.hs
diff options
context:
space:
mode:
authorJoey Hess2016-03-06 13:27:48 -0400
committerJoey Hess2016-03-06 13:27:48 -0400
commit27c5e59fba74601fc1852b80868d8672bc569197 (patch)
tree67dcb82a45ade38c0319dc5b3d90e3b32dc445e0 /src/Propellor/Property/Locale.hs
parent19d7083ed8759d8b76420186f34e31fb46e869d8 (diff)
parent7a8505608c45a49abff2dd4573a8e7579e0c366b (diff)
Merge branch 'joeyconfig'
Diffstat (limited to 'src/Propellor/Property/Locale.hs')
-rw-r--r--src/Propellor/Property/Locale.hs5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/Propellor/Property/Locale.hs b/src/Propellor/Property/Locale.hs
index a9fb3514..06cd63ad 100644
--- a/src/Propellor/Property/Locale.hs
+++ b/src/Propellor/Property/Locale.hs
@@ -57,7 +57,7 @@ available locale = (ensureAvailable <!> ensureUnavailable)
if locale `presentIn` locales
then ensureProperty $
fileProperty desc (foldr uncomment []) f
- `onChange` regenerate
+ `onChange` regenerate
else return FailedChange -- locale unavailable for generation
ensureUnavailable =
fileProperty (locale ++ " locale not generated") (foldr comment []) f
@@ -75,6 +75,5 @@ 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 "locale-gen" []
`assume` MadeChange