opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix for unit tests in galaxy.tools.deps

Browse Source
This commit is contained in:
Daniel Blankenberg
2012-09-14 14:50:27 -04:00
parent 0fc996b3b0
commit cb6fc57be9
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy/tools/deps/__init__.py
+8 -7
View File
@@ -73,13 +73,14 @@ class DependencyManager( object ):
else:
return None, None, None
def _get_installed_dependency( self, installed_tool_dependencies, name, type, version=None ):
for installed_tool_dependency in installed_tool_dependencies:
if version:
if installed_tool_dependency.name==name and installed_tool_dependency.type==type and installed_tool_dependency.version==version:
return installed_tool_dependency
else:
if installed_tool_dependency.name==name and installed_tool_dependency.type==type:
return installed_tool_dependency
if installed_tool_dependencies:
for installed_tool_dependency in installed_tool_dependencies:
if version:
if installed_tool_dependency.name==name and installed_tool_dependency.type==type and installed_tool_dependency.version==version:
return installed_tool_dependency
else:
if installed_tool_dependency.name==name and installed_tool_dependency.type==type:
return installed_tool_dependency
return None
def _get_package_installed_dependency_path( self, installed_tool_dependency, base_path, name, version ):
tool_shed_repository = installed_tool_dependency.tool_shed_repository