[Python-modules-commits] r19278 - in packages/ipython/trunk/debian/patches (2 files)

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

    Date: Saturday, November 12, 2011 @ 18:05:07
  Author: jtaylor-guest
Revision: 19278

add patch to improve error message on missing packages

Added:
  packages/ipython/trunk/debian/patches/improve-error-message-on-missing-ipython-qtconsole.patch
Modified:
  packages/ipython/trunk/debian/patches/series

Added: packages/ipython/trunk/debian/patches/improve-error-message-on-missing-ipython-qtconsole.patch
===================================================================
--- packages/ipython/trunk/debian/patches/improve-error-message-on-missing-ipython-qtconsole.patch	                        (rev 0)
+++ packages/ipython/trunk/debian/patches/improve-error-message-on-missing-ipython-qtconsole.patch	2011-11-12 18:05:07 UTC (rev 19278)
@@ -0,0 +1,23 @@
+From: Julian Taylor <jtaylor.debian at googlemail.com>
+Date: Thu, 7 Jul 2011 18:19:04 +0200
+Subject: improve error message on missing ipython-qtconsole
+
+---
+ IPython/scripts/ipython |    6 +++++-
+ 1 files changed, 5 insertions(+), 1 deletions(-)
+
+diff --git a/IPython/scripts/ipython b/IPython/scripts/ipython
+index 20095a8..e8019e4 100755
+--- a/IPython/scripts/ipython
++++ b/IPython/scripts/ipython
+@@ -7,4 +7,8 @@ entry points."""
+ 
+ from IPython.frontend.terminal.ipapp import launch_new_instance
+ 
+-launch_new_instance()
++try:
++  launch_new_instance()
++except ImportError as e:
++  if "qt.console.qtconsoleapp" in e.message:
++    print "Could not start qtconsole. Please install ipython-qtconsole"
+-- 

Modified: packages/ipython/trunk/debian/patches/series
===================================================================
--- packages/ipython/trunk/debian/patches/series	2011-11-12 18:04:58 UTC (rev 19277)
+++ packages/ipython/trunk/debian/patches/series	2011-11-12 18:05:07 UTC (rev 19278)
@@ -1,2 +1,3 @@
+improve-error-message-on-missing-ipython-qtconsole.patch
 05_fix_seteditor_example.patch
-07_use_lightbg.patch
\ No newline at end of file
+07_use_lightbg.patch