opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-10-25 00:12:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix for determining if a required tool dependency is in an error state.

Browse Source
This commit is contained in:
Greg Von Kuster
2013-12-03 09:35:05 -05:00
parent 8a3ff9163a
commit a91ccbf8fb
2 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy/model/__init__.py
-5
View File
@@ -3630,11 +3630,6 @@ class ToolShedRepository( object ):
return galaxy.util.asbool( self.tool_shed_status.get( 'repository_deprecated', False ) )
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:
lib/tool_shed/galaxy_install/tool_dependencies/install_util.py
+3 -3
View File
@@ -98,9 +98,9 @@ def create_tool_dependency_with_initialized_env_sh_file( app, dependent_install_
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,