1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/changeset/9c46a216e24c/ changeset: 9c46a216e24c user: natefoo date: 2011-12-13 06:45:52 summary: Fix extra files display with object store and the distributed object store config. affected #: 3 files
diff -r a638b139a24187786916bc9b5c5491f4fab744fc -r 9c46a216e24c529a496a50afec13ebcb78106b96 lib/galaxy/objectstore/__init__.py --- a/lib/galaxy/objectstore/__init__.py +++ b/lib/galaxy/objectstore/__init__.py @@ -868,10 +868,10 @@
def __init__(self, config): super(DistributedObjectStore, self).__init__() - assert config is not None, "distributed object store ('object_store = distributed') " \ - "requires a config file, please set one in " \ - "'distributed_object_store_config_file')" - self.distributed_config = config + self.distributed_config = config.distributed_object_store_config_file + assert self.distributed_config is not None, "distributed object store ('object_store = distributed') " \ + "requires a config file, please set one in " \ + "'distributed_object_store_config_file')" self.backends = {} self.weighted_backend_names = []
@@ -1006,7 +1006,7 @@ os.environ['AWS_SECRET_ACCESS_KEY'] = config.aws_secret_key return S3ObjectStore(config=config) elif store == 'distributed': - return DistributedObjectStore(config.distributed_object_store_config_file) + return DistributedObjectStore(config=config) elif store == 'hierarchical': return HierarchicalObjectStore()
diff -r a638b139a24187786916bc9b5c5491f4fab744fc -r 9c46a216e24c529a496a50afec13ebcb78106b96 lib/galaxy/web/controllers/dataset.py --- a/lib/galaxy/web/controllers/dataset.py +++ b/lib/galaxy/web/controllers/dataset.py @@ -382,7 +382,7 @@
if filename and filename != "index": # For files in extra_files_path - file_path = trans.app.object_store.get_filename(data.id, extra_dir='dataset_%s_files' % data.id, alt_name=filename) + file_path = trans.app.object_store.get_filename(data.dataset.id, extra_dir='dataset_%s_files' % data.dataset.id, alt_name=filename) if os.path.exists( file_path ): if os.path.isdir( file_path ): return trans.show_error_message( "Directory listing is not allowed." ) #TODO: Reconsider allowing listing of directories?
diff -r a638b139a24187786916bc9b5c5491f4fab744fc -r 9c46a216e24c529a496a50afec13ebcb78106b96 scripts/functional_tests.py --- a/scripts/functional_tests.py +++ b/scripts/functional_tests.py @@ -59,7 +59,7 @@ tool_config_file = os.environ.get( 'GALAXY_TEST_TOOL_CONF', 'tool_conf.xml.sample' ) tool_data_table_config_path = 'tool_data_table_conf.xml' tool_dependency_dir = os.environ.get( 'GALAXY_TOOL_DEPENDENCY_DIR', None ) - use_hierarchical_object_store = os.environ.get( 'GALAXY_USE_HIERARCHICAL_OBJECT_STORE', False ) + use_distributed_object_store = os.environ.get( 'GALAXY_USE_DISTRIBUTED_OBJECT_STORE', False ) if os.path.exists( 'tool_data_table_conf.test.xml' ): tool_data_table_config_path = 'tool_data_table_conf.test.xml' if start_server: @@ -154,9 +154,9 @@ if tool_dependency_dir is not None: kwargs['tool_dependency_dir'] = tool_dependency_dir
- if use_hierarchical_object_store: - kwargs['object_store'] = 'hierarchical' - kwargs['hierarchical_object_store_config_file'] = 'hierarchical_object_store_conf.xml.sample' + if use_distributed_object_store: + kwargs['object_store'] = 'distributed' + kwargs['distributed_object_store_config_file'] = 'distributed_object_store_conf.xml.sample'
# Build the Universe Application app = UniverseApplication( job_queue_workers = 5,
Repository URL: https://bitbucket.org/galaxy/galaxy-central/
--
This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.