Update localefile patch

This commit is contained in:
Garrett Holmstrom 2011-09-23 18:02:34 -07:00
parent 1d49adcb8d
commit 924e2ab0b4
2 changed files with 9 additions and 1 deletions

View File

@ -25,7 +25,7 @@ Index: cloud-init/cloudinit/CloudConfig/cc_locale.py
def handle(name,cfg,cloud,log,args): def handle(name,cfg,cloud,log,args):
if len(args) != 0: if len(args) != 0:
@@ -32,6 +34,9 @@ def handle(name,cfg,cloud,log,args): @@ -32,12 +34,15 @@ def handle(name,cfg,cloud,log,args):
else: else:
locale = util.get_cfg_option_str(cfg,"locale",cloud.get_locale()) locale = util.get_cfg_option_str(cfg,"locale",cloud.get_locale())
@ -35,3 +35,10 @@ Index: cloud-init/cloudinit/CloudConfig/cc_locale.py
if not locale: return if not locale: return
log.debug("setting locale to %s" % locale) log.debug("setting locale to %s" % locale)
try:
- apply_locale(locale)
+ apply_locale(locale, locale_cfgfile)
except Exception as e:
log.debug(traceback.format_exc(e))
raise Exception("failed to apply locale %s" % locale)

View File

@ -162,6 +162,7 @@ fi
- Fixed logfile permission checking - Fixed logfile permission checking
- Fixed SSH key generation - Fixed SSH key generation
- Fixed a bad method call in FQDN-guessing [LP:857891] - Fixed a bad method call in FQDN-guessing [LP:857891]
- Updated localefile patch
* Fri Sep 23 2011 Garrett Holmstrom <gholms@fedoraproject.org> - 0.6.2-0.2.bzr450 * Fri Sep 23 2011 Garrett Holmstrom <gholms@fedoraproject.org> - 0.6.2-0.2.bzr450
- Updated tzsysconfig patch - Updated tzsysconfig patch