Merge pull request #16 from jsuchome/Code-11-SP3

- do not use non-UTF encoding fallback when nothing is configured
yast · May 15, 2013 · 542dcce · 542dcce
2 parents 68a5068 + d5e3cd6
commit 542dcce
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.17.53
+2.17.54
diff --git a/language/src/modules/Language.ycp b/language/src/modules/Language.ycp
@@ -504,7 +504,10 @@ global define void ReadSysconfigValues () {
     if (!Stage::initial () || Mode::live_installation ())
     {
 	string val = toupper (Misc::SysconfigRead (.sysconfig.language.RC_LANG, ""));
-	use_utf8 = search (val, ".UTF-8") != nil;
+	if (val != "")
+        {
+	  use_utf8 = search (val, ".UTF-8") != nil;
+        }
     }
     else
     {

diff --git a/package/yast2-country.changes b/package/yast2-country.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed May 15 08:53:25 CEST 2013 - jsuchome@suse.cz
+
+- do not use non-UTF encoding fallback when nothing is configured
+  (bnc#815265) 
+- 2.17.54
+
 -------------------------------------------------------------------
 Tue Feb 26 10:07:15 CET 2013 - jsuchome@suse.cz