From 801369741c0f3505858791e49f51f37edfd37307 Mon Sep 17 00:00:00 2001 From: Greg Von Kuster Date: Sat, 2 Nov 2013 11:04:47 -0400 Subject: [PATCH] Fix for handling a repository dependency that has a tool dependency in error because it has a missing env.sh file. --- .../galaxy_install/tool_dependencies/install_util.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/tool_shed/galaxy_install/tool_dependencies/install_util.py b/lib/tool_shed/galaxy_install/tool_dependencies/install_util.py index dcf1fc3189c..271b1b8f51a 100755 --- a/lib/tool_shed/galaxy_install/tool_dependencies/install_util.py +++ b/lib/tool_shed/galaxy_install/tool_dependencies/install_util.py @@ -272,7 +272,12 @@ def handle_set_environment_entry_for_package( app, install_dir, tool_shed_reposi env_var_dict[ 'value' ] = new_value new_env_var_dicts.append( env_var_dict ) else: - log.debug( 'Invalid file %s specified, ignoring set_environment_for_install action.', env_sh_file_path ) + tool_dependency.status = app.model.ToolShedRepository.installation_status.ERROR + error_message = 'Invalid file %s specified, ignoring set_environment_for_install action.', env_sh_file_path + tool_dependency.error_message = error_message + sa_session = app.model.context.current + sa_session.add( tool_dependency ) + sa_session.flush() action_dict[ 'environment_variable' ] = new_env_var_dicts else: action_dict[ 'environment_variable' ] = env_var_dicts