From cb6fc57be955fa4ad6c7c013858ec72c0cfd88e9 Mon Sep 17 00:00:00 2001 From: Daniel Blankenberg Date: Fri, 14 Sep 2012 14:50:27 -0400 Subject: [PATCH] Fix for unit tests in galaxy.tools.deps --- lib/galaxy/tools/deps/__init__.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/lib/galaxy/tools/deps/__init__.py b/lib/galaxy/tools/deps/__init__.py index 3162667cf09..d804584c4b3 100644 --- a/lib/galaxy/tools/deps/__init__.py +++ b/lib/galaxy/tools/deps/__init__.py @@ -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