Merge

lib/galaxy/config.py

@@ -186,6 +186,8 @@ class Configuration( object ):
         self.os_conn_path = kwargs.get( 'os_conn_path', '/' )
         self.object_store_cache_size = float(kwargs.get( 'object_store_cache_size', -1 ))
         self.distributed_object_store_config_file = kwargs.get( 'distributed_object_store_config_file', None )
+        if self.distributed_object_store_config_file is not None:
+            self.distributed_object_store_config_file = resolve_path( self.distributed_object_store_config_file, self.root )
         # Parse global_conf and save the parser
         global_conf = kwargs.get( 'global_conf', None )
         global_conf_parser = ConfigParser.ConfigParser()

lib/galaxy/web/base/controller.py

@@ -19,6 +19,7 @@ from galaxy.visualization.tracks.visual_analytics import get_tool_def
 from galaxy.security.validate_user_input import validate_publicname
 from paste.httpexceptions import *
 from galaxy.exceptions import *
+from galaxy.model import NoConverterException, ConverterDependencyException
 
 from Cheetah.Template import Template
 

scripts/cleanup_datasets/pgcleanup.py

@@ -90,6 +90,7 @@ class Cleanup(object):
         config_dict = {}
         for key, value in config_parser.items('app:main'):
             config_dict[key] = value
+        config_dict['root_dir'] = galaxy_root
 
         self.config = galaxy.config.Configuration(**config_dict)