From 9abe863f26ba742c9f362b3a8177af5c8efa5741 Mon Sep 17 00:00:00 2001 From: Nicola Soranzo Date: Tue, 1 Nov 2016 19:08:06 +0000 Subject: [PATCH] Fix loading of collection operations If MODEL_TOOLS_PATH is not absolute, it will be joined with tool_path (i.e. './tools' ) inside _load_tool_tag_set(), so Galaxy will try to load e.g. './tools/lib/galaxy/tools/unzip_collection.xml' --- lib/galaxy/tools/__init__.py | 2 +- lib/galaxy/tools/toolbox/base.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/galaxy/tools/__init__.py b/lib/galaxy/tools/__init__.py index b739ec4d48a..9410f15197a 100755 --- a/lib/galaxy/tools/__init__.py +++ b/lib/galaxy/tools/__init__.py @@ -67,7 +67,7 @@ import galaxy.jobs log = logging.getLogger( __name__ ) HELP_UNINITIALIZED = threading.Lock() -MODEL_TOOLS_PATH = os.path.dirname(__file__) +MODEL_TOOLS_PATH = os.path.abspath(os.path.dirname(__file__)) class ToolErrorLog: diff --git a/lib/galaxy/tools/toolbox/base.py b/lib/galaxy/tools/toolbox/base.py index 2a2b998b253..c5bc1435df1 100644 --- a/lib/galaxy/tools/toolbox/base.py +++ b/lib/galaxy/tools/toolbox/base.py @@ -615,7 +615,7 @@ class AbstractToolBox( Dictifiable, ManagesIntegratedToolPanelMixin, object ): if labels is not None: tool.labels = labels except IOError: - log.error( "Error reading tool configuration file from path: %s." % path ) + log.error( "Error reading tool configuration file from path: %s" % path ) except Exception: log.exception( "Error reading tool from path: %s" % path )