float_to_lstring(): do not crash when glibc-locale is missing

fallback to unlocalized version (bnc#803163)
yast · Oct 15, 2013 · 7d034e4 · 7d034e4
1 parent ae6daa1
commit 7d034e4
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 2 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-3.1.0
+3.1.1
diff --git a/package/yast2-ruby-bindings.changes b/package/yast2-ruby-bindings.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Oct 15 13:01:18 UTC 2013 - lslezak@suse.cz
+
+- float_to_lstring(): do not crash when glibc-locale is missing,
+  fallback to unlocalized version (bnc#803163)
+- 3.1.1
+
 -------------------------------------------------------------------
 Thu Sep 12 07:53:00 UTC 2013 - jreidinger@suse.com
 

diff --git a/src/binary/Builtin.cc b/src/binary/Builtin.cc
@@ -8,6 +8,7 @@
 
 #include <string>
 #include <sstream>
+#include <stdexcept>
 #include <iconv.h>
 #include <errno.h>
 extern "C" {
@@ -163,7 +164,16 @@ extern "C" {
       return Qnil;
 
     std::wostringstream ss; // bnc#683881#c12: need wide chars
-    ss.imbue (std::locale (""));
+
+    try
+    {
+      ss.imbue (std::locale (""));
+    }
+    catch (const std::runtime_error &error)
+    {
+      y2warning("Cannot set locale (missing glibc-locale package?): %s", error.what());
+    }
+
     ss.precision (NUM2LONG(rprecision));
     ss << fixed<< NUM2DBL(rfloat);
     std::wstring res = ss.str();