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

[dktrkranz at users.alioth.debian.org]

    Date: Saturday, May 26, 2012 @ 16:21:38
  Author: dktrkranz
Revision: 8765

Do not try to launch GUI if X is not available (Closes: #674485)

Added:
  packages/bleachbit/trunk/debian/patches/no_X.patch
Modified:
  packages/bleachbit/trunk/debian/changelog
  packages/bleachbit/trunk/debian/patches/series

Modified: packages/bleachbit/trunk/debian/changelog
===================================================================
--- packages/bleachbit/trunk/debian/changelog	2012-05-25 13:40:48 UTC (rev 8764)
+++ packages/bleachbit/trunk/debian/changelog	2012-05-26 16:21:38 UTC (rev 8765)
@@ -1,3 +1,10 @@
+bleachbit (0.9.2-2) UNRELEASED; urgency=low
+
+  * debian/patches/no_X.patch:
+    - Do not try to launch GUI if X is not available (Closes: #674485).
+
+ -- Luca Falavigna <dktrkranz at debian.org>  Sat, 26 May 2012 18:20:54 +0200
+
 bleachbit (0.9.2-1) unstable; urgency=low
 
   * New upstream release.

Added: packages/bleachbit/trunk/debian/patches/no_X.patch
===================================================================
--- packages/bleachbit/trunk/debian/patches/no_X.patch	                        (rev 0)
+++ packages/bleachbit/trunk/debian/patches/no_X.patch	2012-05-26 16:21:38 UTC (rev 8765)
@@ -0,0 +1,20 @@
+Description: Do not try to launch GUI if X is not available
+Author: Luca Falavigna <dktrkranz at debian.org>
+Forwarded: https://launchpad.net/bugs/1004923
+
+Index: bleachbit-0.9.2/bleachbit.py
+===================================================================
+--- bleachbit-0.9.2.orig/bleachbit.py	2012-03-15 04:24:51.000000000 +0100
++++ bleachbit-0.9.2/bleachbit.py	2012-05-26 18:16:40.679476296 +0200
+@@ -39,6 +39,11 @@
+ 
+ if 1 == len(sys.argv):
+     import gtk
++    try:
++        gtk.gdk.Screen().get_display()
++    except RuntimeError:
++        print "Could not open X display"
++        sys.exit(1)
+     import bleachbit.GUI
+     gui = bleachbit.GUI.GUI()
+     gtk.main()

Modified: packages/bleachbit/trunk/debian/patches/series
===================================================================
--- packages/bleachbit/trunk/debian/patches/series	2012-05-25 13:40:48 UTC (rev 8764)
+++ packages/bleachbit/trunk/debian/patches/series	2012-05-26 16:21:38 UTC (rev 8765)
@@ -2,3 +2,4 @@
 no_update.patch
 local_cleaners_dir.patch
 gnomevfs.patch
+no_X.patch