2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/f4f50588c638/ Changeset: f4f50588c638 Branch: next-stable User: greg Date: 2014-08-04 15:03:01 Summary: Fix 2 bugs in the Tool Shed's tag_handler module discovered by Bjoern Gruning (thanks!) Affected #: 1 file diff -r 01d8f4b058ee63c03381d27715d0b42258eba6f6 -r f4f50588c63807c1da91b5e820cfa15837a20d75 lib/tool_shed/galaxy_install/tool_dependencies/recipe/tag_handler.py --- a/lib/tool_shed/galaxy_install/tool_dependencies/recipe/tag_handler.py +++ b/lib/tool_shed/galaxy_install/tool_dependencies/recipe/tag_handler.py @@ -5,6 +5,7 @@ from galaxy.model.orm import and_ from galaxy.util import listify from galaxy.tools.deps.resolvers import INDETERMINATE_DEPENDENCY +from tool_shed.util import basic_util from tool_shed.util import common_util from tool_shed.util import shed_util_common as suc from tool_shed.util import tool_dependency_util @@ -48,11 +49,12 @@ pass sa_session = app.install_model.context can_install_tool_dependency = False - tool_dependency = get_tool_dependency_by_name_version_type_repository( app, - tool_shed_repository, - tool_dependency_name, - tool_dependency_version, - tool_dependency_type ) + tool_dependency = \ + tool_dependency_util.get_tool_dependency_by_name_version_type_repository( app, + tool_shed_repository, + tool_dependency_name, + tool_dependency_version, + tool_dependency_type ) if tool_dependency.status == app.install_model.ToolDependency.installation_status.INSTALLING: # The tool dependency is in an Installing state, so we don't want to do anything to it. If the tool # dependency is being installed by someone else, we don't want to interfere with that. This assumes https://bitbucket.org/galaxy/galaxy-central/commits/1a24c68d1c7f/ Changeset: 1a24c68d1c7f User: greg Date: 2014-08-04 15:03:31 Summary: Merged next-stable Affected #: 1 file diff -r c1c762d1680b585896aaf622f44e90fa0d8a8f20 -r 1a24c68d1c7f2db103e454e52a40e338db57c4f2 lib/tool_shed/galaxy_install/tool_dependencies/recipe/tag_handler.py --- a/lib/tool_shed/galaxy_install/tool_dependencies/recipe/tag_handler.py +++ b/lib/tool_shed/galaxy_install/tool_dependencies/recipe/tag_handler.py @@ -5,6 +5,7 @@ from galaxy.model.orm import and_ from galaxy.util import listify from galaxy.tools.deps.resolvers import INDETERMINATE_DEPENDENCY +from tool_shed.util import basic_util from tool_shed.util import common_util from tool_shed.util import shed_util_common as suc from tool_shed.util import tool_dependency_util @@ -48,11 +49,12 @@ pass sa_session = app.install_model.context can_install_tool_dependency = False - tool_dependency = get_tool_dependency_by_name_version_type_repository( app, - tool_shed_repository, - tool_dependency_name, - tool_dependency_version, - tool_dependency_type ) + tool_dependency = \ + tool_dependency_util.get_tool_dependency_by_name_version_type_repository( app, + tool_shed_repository, + tool_dependency_name, + tool_dependency_version, + tool_dependency_type ) if tool_dependency.status == app.install_model.ToolDependency.installation_status.INSTALLING: # The tool dependency is in an Installing state, so we don't want to do anything to it. If the tool # dependency is being installed by someone else, we don't want to interfere with that. This assumes 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.