diff options
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | src/Propellor/Property/Locale.hs | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index ec899f56..da1dc5a9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,8 @@ propellor (4.7.6) UNRELEASED; urgency=medium Thanks, Sean Whitton * Locale: Make sure that the locales package is installed when enabling locales. + * Locale: Display an error message when /etc/locale.gen does not contain + the requested locale. -- Joey Hess <id@joeyh.name> Tue, 01 Aug 2017 15:33:49 -0400 diff --git a/src/Propellor/Property/Locale.hs b/src/Propellor/Property/Locale.hs index 14c6f0b0..53091fc9 100644 --- a/src/Propellor/Property/Locale.hs +++ b/src/Propellor/Property/Locale.hs @@ -63,7 +63,7 @@ available locale = ensureAvailable `requires` Apt.installed ["locales"] then ensureProperty w $ fileProperty desc (foldr uncomment []) f `onChange` regenerate - else return FailedChange -- locale unavailable for generation + else error $ "locale " ++ locale ++ " is not present in /etc/locale.gen, even in commented out form; cannot generate" ensureUnavailable :: Property DebianLike ensureUnavailable = tightenTargets $ fileProperty (locale ++ " locale not generated") (foldr comment []) f |