From cd3936bfb0f2004f479274c7a6fa7e16b2c145a8 Mon Sep 17 00:00:00 2001 From: Sergey Golitsynskiy Date: Tue, 7 Jan 2020 12:17:02 -0500 Subject: [PATCH 1/2] Check return value of quick_load --- lib/galaxy/tools/toolbox/base.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/galaxy/tools/toolbox/base.py b/lib/galaxy/tools/toolbox/base.py index cc0396fffd1..2e41377c793 100644 --- a/lib/galaxy/tools/toolbox/base.py +++ b/lib/galaxy/tools/toolbox/base.py @@ -839,8 +839,7 @@ class AbstractToolBox(Dictifiable, ManagesIntegratedToolPanelMixin): if os.path.isdir(child_path) and recursive: self.__watch_directory(child_path, elems, integrated_elems, load_panel_dict, recursive) elif self._looks_like_a_tool(child_path): - quick_load(child_path, async_load=False) - tool_loaded = True + tool_loaded = quick_load(child_path, async_load=False) if (tool_loaded or force_watch) and self._tool_watcher: self._tool_watcher.watch_directory(directory, quick_load) From 1cafdf9397fee4f08e8cb8391baaadc8d7d2926b Mon Sep 17 00:00:00 2001 From: Sergey Golitsynskiy Date: Tue, 7 Jan 2020 12:54:45 -0500 Subject: [PATCH 2/2] Make it explicit Co-Authored-By: Nicola Soranzo --- lib/galaxy/tools/toolbox/base.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/galaxy/tools/toolbox/base.py b/lib/galaxy/tools/toolbox/base.py index 2e41377c793..3c25ca9e23a 100644 --- a/lib/galaxy/tools/toolbox/base.py +++ b/lib/galaxy/tools/toolbox/base.py @@ -839,7 +839,8 @@ class AbstractToolBox(Dictifiable, ManagesIntegratedToolPanelMixin): if os.path.isdir(child_path) and recursive: self.__watch_directory(child_path, elems, integrated_elems, load_panel_dict, recursive) elif self._looks_like_a_tool(child_path): - tool_loaded = quick_load(child_path, async_load=False) + tool_id = quick_load(child_path, async_load=False) + tool_loaded = bool(tool_id) if (tool_loaded or force_watch) and self._tool_watcher: self._tool_watcher.watch_directory(directory, quick_load)