From cf51e0b89bacded65b2ac7d2d743dec59a3a6e5a Mon Sep 17 00:00:00 2001 From: Dannon Baker Date: Wed, 1 Jul 2015 11:54:05 -0400 Subject: [PATCH] Merge conflict due to pep8'ifying, resolved by applying changes. --- lib/galaxy/tools/actions/metadata.py | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/lib/galaxy/tools/actions/metadata.py b/lib/galaxy/tools/actions/metadata.py index 6acea06e90a..ee90b704bf5 100644 --- a/lib/galaxy/tools/actions/metadata.py +++ b/lib/galaxy/tools/actions/metadata.py @@ -75,16 +75,17 @@ class SetMetadataToolAction( ToolAction ): external_metadata_wrapper = JobExternalOutputMetadataWrapper( job ) cmd_line = external_metadata_wrapper.setup_external_metadata( dataset, sa_session, - exec_dir = None, - tmp_dir = job_working_dir, - dataset_files_path = app.model.Dataset.file_path, - output_fnames = input_paths, - config_root = app.config.root, - config_file = app.config.config_file, - datatypes_config = app.datatypes_registry.integrated_datatypes_configs, - job_metadata = None, - include_command = False, - kwds = { 'overwrite' : overwrite } ) + exec_dir=None, + tmp_dir=job_working_dir, + dataset_files_path=app.model.Dataset.file_path, + output_fnames=input_paths, + config_root=app.config.root, + config_file=app.config.config_file, + datatypes_config=app.datatypes_registry.integrated_datatypes_configs, + job_metadata=None, + include_command=False, + max_metadata_value_size=app.config.max_metadata_value_size, + kwds={ 'overwrite' : overwrite } ) incoming[ '__SET_EXTERNAL_METADATA_COMMAND_LINE__' ] = cmd_line for name, value in tool.params_to_strings( incoming, app ).iteritems(): job.add_parameter( name, value )