[Reportbug-commits] [SCM] Reportbug - reports bugs in the Debian distribution branch, master, updated. 4.0-32-gc4cb9cf

[Sandro Tosi]

The following commit has been merged in the master branch:
commit b13cf7dbf6aeeb5713c731e66ebdb800b607782e
Author: Sandro Tosi <morph at debian.org>
Date:   Wed Apr 8 23:54:55 2009 +0200

    * reportbug/ui/text_ui.py:
      - exit (with error) in case of locale not available; thanks Nico Schottelius
        for the report and Carl Chenet for the patch; Closes: #512506

diff --git a/debian/changelog b/debian/changelog
index 35c745c..f3f38f9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,9 @@ reportbug (4.1) UNRELEASED; urgency=low
     - parse changelog version removing any '+.*' part (to allow rebuild with
       binNMU version style); thanks to Daniel Schepler for the report;
       Closes: #522010
+  * reportbug/ui/text_ui.py:
+    - exit (with error) in case of locale not available; thanks Nico Schottelius
+      for the report and Carl Chenet for the patch; Closes: #512506
 
   [ Luca Bruno ]
   * bin/reportbug
@@ -44,7 +47,7 @@ reportbug (4.1) UNRELEASED; urgency=low
     - do not try to import newt ui as default ui, since it's removed now; use
       text ui instead
 
- -- Luca Bruno <lethalman88 at gmail.com>  Thu, 02 Apr 2009 19:04:14 +0200
+ -- Sandro Tosi <morph at debian.org>  Wed, 08 Apr 2009 23:53:28 +0200
 
 reportbug (4.0) unstable; urgency=low
 
diff --git a/reportbug/ui/text_ui.py b/reportbug/ui/text_ui.py
index 269749b..721fc6b 100644
--- a/reportbug/ui/text_ui.py
+++ b/reportbug/ui/text_ui.py
@@ -543,7 +543,11 @@ def handle_bts_query(package, bts, mirrors=None, http_proxy="",
 
 def browse_bugs(hierarchy, count, bugs, bts, queryonly, mirrors,
                 http_proxy, screen, title):
-    output_encoding = locale.getpreferredencoding()
+    try:
+        output_encoding = locale.getpreferredencoding()
+    except locale.Error, msg:
+        print msg
+        sys.exit(1)
     endcount = catcount = 0
     scount = startcount = 1
     category = hierarchy[0]

-- 
Reportbug - reports bugs in the Debian distribution