Merge branch 'release_15.03' into dev

This commit is contained in:
Nate Coraor
2015-03-16 10:08:39 -04:00
2 changed files with 2 additions and 0 deletions
+1
View File
@@ -0,0 +1 @@
../galaxy_ext/metadata
+1
View File
@@ -70,6 +70,7 @@ class SetMetadataToolAction( ToolAction ):
# Store original dataset state, so we can restore it. A separate table might be better (no chance of 'losing' the original state)?
incoming[ '__ORIGINAL_DATASET_STATE__' ] = dataset.state
input_paths = [DatasetPath( dataset.id, real_path=dataset.file_name, mutable=False )]
app.object_store.create(job, base_dir='job_work', dir_only=True, extra_dir=str(job.id))
job_working_dir = app.object_store.get_filename(job, base_dir='job_work', dir_only=True, extra_dir=str(job.id))
external_metadata_wrapper = JobExternalOutputMetadataWrapper( job )
cmd_line = external_metadata_wrapper.setup_external_metadata( dataset,