Merge pull request #3115 from nsoranzo/release_16.07_fix_collection_o…

…ps_loading [16.07] Fix loading of collection operations
galaxyproject · Nov 1, 2016 · 5963a2f · 5963a2f
2 parents 65dc4f2 + 9abe863
commit 5963a2f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lib/galaxy/tools/__init__.py b/lib/galaxy/tools/__init__.py
@@ -67,7 +67,7 @@
 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
@@ -615,7 +615,7 @@ def _load_tool_tag_set( self, item, panel_dict, integrated_panel_dict, tool_path
             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 )