opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge conflict due to pep8'ifying, resolved by applying changes.

Browse Source
This commit is contained in:
Dannon Baker
2015-07-01 14:26:49 -04:00
parent c00da2a63b
commit cf51e0b89b
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy/tools/actions/metadata.py
+11 -10
View File
@@ -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 )