From 05cd16f11cb523345894816ab6cc8165ebe71559 Mon Sep 17 00:00:00 2001 From: John Chilton Date: Tue, 20 Dec 2016 13:11:18 -0500 Subject: [PATCH] Fix explicit Docker container resolution. Fix thanks to @stevecassidy. Fixes #3207. Broken with introduction of container resolution stradegies in #2986. --- lib/galaxy/tools/deps/container_resolvers/explicit.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/galaxy/tools/deps/container_resolvers/explicit.py b/lib/galaxy/tools/deps/container_resolvers/explicit.py index 851f0c1f99c..be83e0d92f7 100644 --- a/lib/galaxy/tools/deps/container_resolvers/explicit.py +++ b/lib/galaxy/tools/deps/container_resolvers/explicit.py @@ -20,7 +20,7 @@ class ExplicitContainerResolver(ContainerResolver): a correct container. """ for container_description in tool_info.container_descriptions: - if self._container_type_enabled(container_description): - return True + if self._container_type_enabled(container_description, enabled_container_types): + return container_description - return False + return None