2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/3351ffb48668/ Changeset: 3351ffb48668 User: dannon Date: 2014-12-15 19:01:47+00:00 Summary: Slightly more specific error message (and removal of the useless stack dump) for IOError when loading a tool. Affected #: 1 file diff -r 6d85572398e770efcd0fbf46cf9d7655795dd3e1 -r 3351ffb48668c9bb3076c2cfb6645e179b722535 lib/galaxy/tools/__init__.py --- a/lib/galaxy/tools/__init__.py +++ b/lib/galaxy/tools/__init__.py @@ -629,7 +629,9 @@ integrated_panel_dict[ key ] = tool else: integrated_panel_dict.insert( index, key, tool ) - except: + except IOError: + log.error( "Error reading tool configuration file from path: %s." % path ) + except Exception: log.exception( "Error reading tool from path: %s" % path ) def __add_tool( self, tool, load_panel_dict, panel_dict ): https://bitbucket.org/galaxy/galaxy-central/commits/f06ac1a9f76e/ Changeset: f06ac1a9f76e User: dannon Date: 2014-12-15 22:26:32+00:00 Summary: Merge. Affected #: 4 files diff -r 3351ffb48668c9bb3076c2cfb6645e179b722535 -r f06ac1a9f76efef1eb1cc174979184a73a01711d templates/admin/tool_shed_repository/manage_repository_tool_dependencies.mako --- a/templates/admin/tool_shed_repository/manage_repository_tool_dependencies.mako +++ b/templates/admin/tool_shed_repository/manage_repository_tool_dependencies.mako @@ -57,7 +57,7 @@ <td>${tool_dependency.version|h}</td><td>${tool_dependency.type|h}</td><td>${tool_dependency.status|h}</td> - <td>${error_message|h}</td> + <td>${error_message}</td></tr> %endfor </table> diff -r 3351ffb48668c9bb3076c2cfb6645e179b722535 -r f06ac1a9f76efef1eb1cc174979184a73a01711d test/functional/tools/code_file.py --- /dev/null +++ b/test/functional/tools/code_file.py @@ -0,0 +1,14 @@ + + +from galaxy.tools.parameters import DataToolParameter + + + +def validate_input( trans, error_map, param_values, page_param_map ): + """ + Validates the user input, before execution. + """ + first = param_values['name1'] + second = param_values['name2'] + if first == second: + error_map['name1'] = "The value names should be different." diff -r 3351ffb48668c9bb3076c2cfb6645e179b722535 -r f06ac1a9f76efef1eb1cc174979184a73a01711d test/functional/tools/code_file.xml --- /dev/null +++ b/test/functional/tools/code_file.xml @@ -0,0 +1,15 @@ +<tool id="code_file" name="code_file" version="1.0.0"> + <description>code_file</description> + <code file="code_file.py" /> + <command>cat $input1 > $output</command> + <inputs> + <param name="input1" type="data" label="Concatenate Dataset" /> + <param name="name1" type="text" value="FactorName" label="value one should be different than value two" /> + <param name="name2" type="text" value="FactorName" label="value one should be different than value two" /> + </inputs> + <outputs> + <data format="txt" name="output" /> + </outputs> + <tests> + </tests> +</tool> diff -r 3351ffb48668c9bb3076c2cfb6645e179b722535 -r f06ac1a9f76efef1eb1cc174979184a73a01711d test/functional/tools/samples_tool_conf.xml --- a/test/functional/tools/samples_tool_conf.xml +++ b/test/functional/tools/samples_tool_conf.xml @@ -3,6 +3,7 @@ <tool file="upload.xml"/><tool file="simple_constructs.xml" /><tool file="composite.xml" /> + <tool file="code_file.xml" /><tool file="disambiguate_cond.xml" /><tool file="multi_repeats.xml"/><tool file="multi_page.xml"/> Repository URL: https://bitbucket.org/galaxy/galaxy-central/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.