[cloud-init/f16] Update localefile patch

gholms gholms at fedoraproject.org
Sat Sep 24 23:10:04 UTC 2011


commit 924e2ab0b492707122e25e05be7c4d0973fa5f31
Author: Garrett Holmstrom <gholms at fedoraproject.org>
Date:   Fri Sep 23 18:02:34 2011 -0700

    Update localefile patch

 cloud-init-0.6.2-localefile.patch |    9 ++++++++-
 cloud-init.spec                   |    1 +
 2 files changed, 9 insertions(+), 1 deletions(-)
---
diff --git a/cloud-init-0.6.2-localefile.patch b/cloud-init-0.6.2-localefile.patch
index 49b55c0..78c9808 100644
--- a/cloud-init-0.6.2-localefile.patch
+++ b/cloud-init-0.6.2-localefile.patch
@@ -25,7 +25,7 @@ Index: cloud-init/cloudinit/CloudConfig/cc_locale.py
  
  def handle(name,cfg,cloud,log,args):
      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:
          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
  
      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)
diff --git a/cloud-init.spec b/cloud-init.spec
index 2999aa6..eb002ac 100644
--- a/cloud-init.spec
+++ b/cloud-init.spec
@@ -162,6 +162,7 @@ fi
 - Fixed logfile permission checking
 - Fixed SSH key generation
 - Fixed a bad method call in FQDN-guessing [LP:857891]
+- Updated localefile patch
 
 * Fri Sep 23 2011 Garrett Holmstrom <gholms at fedoraproject.org> - 0.6.2-0.2.bzr450
 - Updated tzsysconfig patch


More information about the scm-commits mailing list