diff options
| author | Scott Moser <smoser@ubuntu.com> | 2016-03-14 14:16:49 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2016-03-14 14:16:49 -0400 |
| commit | 92db1b884bf34339a4536a20123c45b01c9c49ce (patch) | |
| tree | 22be0de3d0496212d26015c3b30423da9338aa5c /cloudinit/config/cc_locale.py | |
| parent | 91ccf1b55b5b79694449446b029dd7c4570517a5 (diff) | |
| parent | 72f826bff694b612d54b177635ca7e0dc83aed2f (diff) | |
| download | vyos-cloud-init-92db1b884bf34339a4536a20123c45b01c9c49ce.tar.gz vyos-cloud-init-92db1b884bf34339a4536a20123c45b01c9c49ce.zip | |
merge with trunk
Diffstat (limited to 'cloudinit/config/cc_locale.py')
| -rw-r--r-- | cloudinit/config/cc_locale.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cloudinit/config/cc_locale.py b/cloudinit/config/cc_locale.py index 6feaae9d..bbe5fcae 100644 --- a/cloudinit/config/cc_locale.py +++ b/cloudinit/config/cc_locale.py @@ -27,9 +27,9 @@ def handle(name, cfg, cloud, log, args): else: locale = util.get_cfg_option_str(cfg, "locale", cloud.get_locale()) - if not locale: - log.debug(("Skipping module named %s, " - "no 'locale' configuration found"), name) + if util.is_false(locale): + log.debug("Skipping module named %s, disabled by config: %s", + name, locale) return log.debug("Setting locale to %s", locale) |