From 1d0ab0969a920d48ed36aa4891538ed4608af1ff Mon Sep 17 00:00:00 2001 From: Carl Eberhard Date: Mon, 4 Mar 2013 13:51:52 -0500 Subject: [PATCH] call_hook: Fix to handle exception.args more gracefully when modifying --- lib/galaxy/tools/__init__.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/galaxy/tools/__init__.py b/lib/galaxy/tools/__init__.py index 08defe4a00c..856f181065e 100755 --- a/lib/galaxy/tools/__init__.py +++ b/lib/galaxy/tools/__init__.py @@ -2715,7 +2715,10 @@ class Tool( object ): if code: return code( *args, **kwargs ) except Exception, e: - e.args = ( "Error in '%s' hook '%s', original message: %s" % ( self.name, hook_name, e.args[0] ), ) + original_message = '' + if len( e.args ): + original_message = e.args[0] + e.args = ( "Error in '%s' hook '%s', original message: %s" % ( self.name, hook_name, original_message ), ) raise def exec_before_job( self, app, inp_data, out_data, param_dict={} ): pass