[PATCH 2/3] Stop writing /etc/sysconfig/i18n (#871543)

Michal Schmidt mschmidt at redhat.com
Tue Dec 4 13:29:57 UTC 2012


Write only /etc/locale.conf.
---
 pyanaconda/localization.py | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/pyanaconda/localization.py b/pyanaconda/localization.py
index 066a7ad..e806adf 100644
--- a/pyanaconda/localization.py
+++ b/pyanaconda/localization.py
@@ -30,7 +30,6 @@ import babel
 
 LOCALE_PREFERENCES = {}
 
-SYSCONF_I18N_FILE_PATH = "/etc/sysconfig/i18n"
 LOCALE_CONF_FILE_PATH = "/etc/locale.conf"
 
 class LocalizationConfigError(Exception):
@@ -270,8 +269,7 @@ def _get_locale_script(locale):
 
 def write_language_configuration(lang, root):
     """
-    Write language configuration to the $root/etc/sysconfig/i18n and the
-    $root/etc/locale.conf files.
+    Write language configuration to the $root/etc/locale.conf file.
 
     @param lang: ksdata.lang object
     @param root: path to the root of the installed system
@@ -279,15 +277,6 @@ def write_language_configuration(lang, root):
     """
 
     try:
-        fpath = os.path.normpath(root + SYSCONF_I18N_FILE_PATH)
-        with open(fpath, "w") as fobj:
-            fobj.write('LANG="%s"\n' % lang.lang)
-
-    except IOError as ioerr:
-        msg = "Cannot write language configuration file: %s" % ioerr.strerror
-        raise LocalizationConfigError(msg)
-
-    try:
         fpath = os.path.normpath(root + LOCALE_CONF_FILE_PATH)
         with open(fpath, "w") as fobj:
             fobj.write('LANG="%s"\n' % lang.lang)
-- 
1.8.0.1



More information about the anaconda-patches mailing list