1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/dd53fe2a3e73/ Changeset: dd53fe2a3e73 User: greg Date: 2013-12-03 15:35:05 Summary: Fix for determining if a required tool dependency is in an error state. Affected #: 2 files diff -r a62c54ddbe2a845be9f0ee2dc4fe4b5820bcd70c -r dd53fe2a3e7308ccd7a007f78ae6e29b7eff9ef0 lib/galaxy/model/__init__.py --- a/lib/galaxy/model/__init__.py +++ b/lib/galaxy/model/__init__.py @@ -3631,11 +3631,6 @@ return False @property - def is_installed( self ): - return self.status in [ self.installation_status.DEACTIVATED, - self.installation_status.INSTALLED ] - - @property def is_latest_installable_revision( self ): if self.tool_shed_status: return galaxy.util.asbool( self.tool_shed_status.get( 'latest_installable_revision', False ) ) diff -r a62c54ddbe2a845be9f0ee2dc4fe4b5820bcd70c -r dd53fe2a3e7308ccd7a007f78ae6e29b7eff9ef0 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 @@ -98,9 +98,9 @@ tool_dependency, error_message, remove_installation_path=False ) - elif required_tool_dependency.in_error_state: - error_message = "This tool dependency's required tool dependency %s has status %s." % \ - ( str( required_tool_dependency.name ), str( required_tool_dependency.status ) ) + elif required_tool_dependency is not None and required_tool_dependency.in_error_state: + error_message = "This tool dependency's required tool dependency %s version %s has status %s." % \ + ( str( required_tool_dependency.name ), str( required_tool_dependency.version ), str( required_tool_dependency.status ) ) tool_dependency = tool_dependency_util.handle_tool_dependency_installation_error( app, tool_dependency, error_message, 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.