Merge pull request #3115 from nsoranzo/release_16.07_fix_collection_ops_loading

[16.07] Fix loading of collection operations

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:

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 )