[Python-apps-commits] r2684 - in packages/bleachbit/trunk/debian (3 files)

[dktrkranz-guest at users.alioth.debian.org]

    Date: Monday, April 6, 2009 @ 10:03:04
  Author: dktrkranz-guest
Revision: 2684

Fix AttributeError if LANG is not set (Closes: #519027)

Added:
  packages/bleachbit/trunk/debian/patches/LANG_env
Modified:
  packages/bleachbit/trunk/debian/changelog
  packages/bleachbit/trunk/debian/patches/series

Modified: packages/bleachbit/trunk/debian/changelog
===================================================================
--- packages/bleachbit/trunk/debian/changelog	2009-04-06 09:48:23 UTC (rev 2683)
+++ packages/bleachbit/trunk/debian/changelog	2009-04-06 10:03:04 UTC (rev 2684)
@@ -1,3 +1,10 @@
+bleachbit (0.4.0-2) UNRELEASED; urgency=low
+
+  * debian/patches/LANG_env:
+    - Fix AttributeError if LANG is not set (Closes: #519027).
+
+ -- Luca Falavigna <dktrkranz at ubuntu.com>  Mon, 06 Apr 2009 12:01:22 +0200
+
 bleachbit (0.4.0-1) unstable; urgency=low
 
   * New upstream release.

Added: packages/bleachbit/trunk/debian/patches/LANG_env
===================================================================
--- packages/bleachbit/trunk/debian/patches/LANG_env	                        (rev 0)
+++ packages/bleachbit/trunk/debian/patches/LANG_env	2009-04-06 10:03:04 UTC (rev 2684)
@@ -0,0 +1,27 @@
+Fix AttributeError if LANG is not set.
+http://bugs.debian.org/519027
+https://launchpad.net/bugs/340819
+
+Index: bleachbit-0.4.0/bleachbit/Options.py
+===================================================================
+--- bleachbit-0.4.0.orig/bleachbit/Options.py	2009-04-06 11:46:26.000000000 +0200
++++ bleachbit-0.4.0/bleachbit/Options.py	2009-04-06 11:47:14.000000000 +0200
+@@ -51,13 +51,14 @@
+         if not self.config.has_section('preserve_languages'):
+             import locale
+             lang = locale.getdefaultlocale()[0]
+-            pos = lang.find('_')
+-            if -1 != pos:
+-                lang = lang [0 : pos]
+             if None == lang:
+                 lang = 'en'
+                 print "warning: No default language found.  Assuming '%s'" % lang
+-            print "info: automatically preserving language '%s'" % (lang,)
++            else:
++                pos = lang.find('_')
++                if -1 != pos:
++                    lang = lang [0 : pos]
++            print "info: automatically preserving language '%s'" % lang
+             self.set_language(lang, True)
+ 
+         # BleachBit upgrade or first start ever

Modified: packages/bleachbit/trunk/debian/patches/series
===================================================================
--- packages/bleachbit/trunk/debian/patches/series	2009-04-06 09:48:23 UTC (rev 2683)
+++ packages/bleachbit/trunk/debian/patches/series	2009-04-06 10:03:04 UTC (rev 2684)
@@ -1,3 +1,4 @@
 desktop_file
 no_update
 launcher
+LANG_env