2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/2be3aed79643/ Changeset: 2be3aed79643 Branch: next-stable User: greg Date: 2013-11-02 16:04:47 Summary: Fix for handling a repository dependency that has a tool dependency in error because it has a missing env.sh file. Affected #: 1 file diff -r 52df185d7552f2ecc13097bdae86388faf640990 -r 2be3aed79643555879b1b5154449872bcd6447da lib/tool_shed/galaxy_install/tool_dependencies/install_util.py --- 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 @@ 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 https://bitbucket.org/galaxy/galaxy-central/commits/68c80bac0d4d/ Changeset: 68c80bac0d4d User: greg Date: 2013-11-02 16:05:11 Summary: Merged from next-stable Affected #: 1 file diff -r ea6ff3d7224db5d218eefa91af1b08626229eae1 -r 68c80bac0d4d71854526f6e56156f09b46059205 lib/tool_shed/galaxy_install/tool_dependencies/install_util.py --- 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 @@ 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 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.