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

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

    Date: Monday, April 6, 2009 @ 10:19:19
  Author: dktrkranz-guest
Revision: 2687

Suppress locale files warning messages when they are not locale files (Closes #521240)

Added:
  packages/bleachbit/trunk/debian/patches/suppress_locales_warnings
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 10:11:56 UTC (rev 2686)
+++ packages/bleachbit/trunk/debian/changelog	2009-04-06 10:19:19 UTC (rev 2687)
@@ -1,12 +1,15 @@
-bleachbit (0.4.0-2) UNRELEASED; urgency=low
+bleachbit (0.4.0-2) unstable; urgency=low
 
   * debian/patches/LANG_env:
     - Fix AttributeError if LANG is not set (Closes: #519027).
   * debian/patches/no_X:
     - Do not show intrusive pyGTK warnings if X is not available, only
       display a message X is required to run BleachBit (Closes: #520107).
+  * debian/patches/suppress_locales_warnings:
+    - Suppress locale files warning messages when they are actually not
+      locale files (Closes #521240).
 
- -- Luca Falavigna <dktrkranz at ubuntu.com>  Mon, 06 Apr 2009 12:03:55 +0200
+ -- Luca Falavigna <dktrkranz at ubuntu.com>  Mon, 06 Apr 2009 12:16:18 +0200
 
 bleachbit (0.4.0-1) unstable; urgency=low
 

Modified: packages/bleachbit/trunk/debian/patches/series
===================================================================
--- packages/bleachbit/trunk/debian/patches/series	2009-04-06 10:11:56 UTC (rev 2686)
+++ packages/bleachbit/trunk/debian/patches/series	2009-04-06 10:19:19 UTC (rev 2687)
@@ -2,4 +2,5 @@
 no_update
 launcher
 LANG_env
-debian/patches/no_X
+no_X
+suppress_locales_warnings

Added: packages/bleachbit/trunk/debian/patches/suppress_locales_warnings
===================================================================
--- packages/bleachbit/trunk/debian/patches/suppress_locales_warnings	                        (rev 0)
+++ packages/bleachbit/trunk/debian/patches/suppress_locales_warnings	2009-04-06 10:19:19 UTC (rev 2687)
@@ -0,0 +1,25 @@
+Suppress locale files warning messages when they are not locale files.
+http://bugs.debian.org/521240
+
+Index: bleachbit-0.4.0/bleachbit/Unix.py
+===================================================================
+--- bleachbit-0.4.0.orig/bleachbit/Unix.py	2009-04-06 11:54:45.000000000 +0200
++++ bleachbit-0.4.0/bleachbit/Unix.py	2009-04-06 11:56:03.000000000 +0200
+@@ -172,7 +172,7 @@
+             try:
+                 lang = locale_to_language(locale)
+             except:
+-                print "Warning: invalid path '%s' where expecting a locale" % locale
++#               print "Warning: invalid path '%s' where expecting a locale" % locale
+                 continue
+             if not lang in self.__languages:
+                 self.__languages.append(lang)
+@@ -207,7 +207,7 @@
+             try:
+                 language_code = locale_to_language(path)
+             except:
+-                print "Warning: invalid path '%s' where expecting a locale" % path
++#               print "Warning: invalid path '%s' where expecting a locale" % path
+                 continue
+             if None != language_filter and language_filter(locale_code, language_code):
+                 continue