From 218e32119b82dc4849ff66baebd988543f82332e Mon Sep 17 00:00:00 2001 From: James Taylor Date: Mon, 10 Sep 2012 14:05:56 -0400 Subject: [PATCH 1/2] Datatype conversion exceptions no imported but used in base controller. --- lib/galaxy/web/base/controller.py | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/galaxy/web/base/controller.py b/lib/galaxy/web/base/controller.py index 5c38114355b..4ed9dd88ce4 100644 --- a/lib/galaxy/web/base/controller.py +++ b/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 From c8e49cdd6d221db433d049bf6e1007d9c7ebcd23 Mon Sep 17 00:00:00 2001 From: Nate Coraor Date: Mon, 10 Sep 2012 14:07:05 -0400 Subject: [PATCH 2/2] Bugfix for pgcleanup.py --- lib/galaxy/config.py | 2 ++ scripts/cleanup_datasets/pgcleanup.py | 1 + 2 files changed, 3 insertions(+) diff --git a/lib/galaxy/config.py b/lib/galaxy/config.py index b5df8416b07..d03d1e3b335 100644 --- a/lib/galaxy/config.py +++ b/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() diff --git a/scripts/cleanup_datasets/pgcleanup.py b/scripts/cleanup_datasets/pgcleanup.py index 66a60a32ea5..dd5110bbb7f 100755 --- a/scripts/cleanup_datasets/pgcleanup.py +++ b/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)