[Python-apps-commits] r13105 - in packages/terminator/trunk/debian (3 files)

[pochu at users.alioth.debian.org]

    Date: Sunday, April 24, 2016 @ 21:43:20
  Author: pochu
Revision: 13105

debian/patches/gi-require-exception.diff: New patch. Catch all exception
types when importing gi modules, as gi.require_version throws ValueErrors
when a module is not available.

Added:
  packages/terminator/trunk/debian/patches/gi-require-exception.diff
Modified:
  packages/terminator/trunk/debian/changelog
  packages/terminator/trunk/debian/patches/series

Modified: packages/terminator/trunk/debian/changelog
===================================================================
--- packages/terminator/trunk/debian/changelog	2016-04-24 21:41:45 UTC (rev 13104)
+++ packages/terminator/trunk/debian/changelog	2016-04-24 21:43:20 UTC (rev 13105)
@@ -5,6 +5,9 @@
   * debian/control: Update (build-)dependencies.
     + Depends on the new vte 2.91. Closes: #790190.
   * debian/patches/series: Temporarily disable force_xdg-open.diff.
+  * debian/patches/gi-require-exception.diff: New patch. Catch all exception
+    types when importing gi modules, as gi.require_version throws ValueErrors
+    when a module is not available.
 
  -- Emilio Pozuelo Monfort <pochu at debian.org>  Thu, 21 Apr 2016 16:56:23 +0200
 

Added: packages/terminator/trunk/debian/patches/gi-require-exception.diff
===================================================================
--- packages/terminator/trunk/debian/patches/gi-require-exception.diff	                        (rev 0)
+++ packages/terminator/trunk/debian/patches/gi-require-exception.diff	2016-04-24 21:43:20 UTC (rev 13105)
@@ -0,0 +1,33 @@
+--- a/terminatorlib/config.py
++++ b/terminatorlib/config.py
+@@ -83,7 +83,7 @@
+     import gi
+     gi.require_version('GConf','2.0')
+     from gi.repository import GConf
+-except ImportError:
++except:
+     dbg('Unable to import gconf, GNOME defaults unavailable')
+ 
+ DEFAULTS = {
+--- a/terminatorlib/window.py
++++ b/terminatorlib/window.py
+@@ -23,7 +23,7 @@
+         gi.require_version('Keybinder', '3.0')
+         from gi.repository import Keybinder
+         Keybinder.init()
+-    except ImportError:
++    except:
+         err('Warning: python-keybinder is not installed. This means the \
+ hide_window shortcut will be unavailable')
+ 
+--- a/terminatorlib/plugins/activitywatch.py
++++ b/terminatorlib/plugins/activitywatch.py
+@@ -21,7 +21,7 @@
+     # This is inside this try so we only make the plugin available if pynotify
+     #  is present on this computer.
+     AVAILABLE = ['ActivityWatch', 'InactivityWatch']
+-except ImportError:
++except:
+     err(_('ActivityWatch plugin unavailable: please install python-notify'))
+ 
+ config = Config()

Modified: packages/terminator/trunk/debian/patches/series
===================================================================
--- packages/terminator/trunk/debian/patches/series	2016-04-24 21:41:45 UTC (rev 13104)
+++ packages/terminator/trunk/debian/patches/series	2016-04-24 21:43:20 UTC (rev 13105)
@@ -2,3 +2,4 @@
 not-install-doc.diff
 add-keywords-entry.diff
 #force_xdg-open.diff
+gi-require-exception.diff