1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/09a383314143/ Changeset: 09a383314143 User: dan Date: 2013-10-07 22:27:08 Summary: Fix for auto-detect metadata tool running second set metadata call. Affected #: 3 files diff -r 3679add0809c669e752c913ade2fc8e45adcff46 -r 09a383314143244d37b5d40a565e75b131dff2b5 lib/galaxy/jobs/__init__.py --- a/lib/galaxy/jobs/__init__.py +++ b/lib/galaxy/jobs/__init__.py @@ -1495,6 +1495,12 @@ just copy these files directly to the ulimate destination. """ return output_path + + @property + def requires_setting_metadata( self ): + if self.tool: + return self.tool.requires_setting_metadata + return False class TaskWrapper(JobWrapper): diff -r 3679add0809c669e752c913ade2fc8e45adcff46 -r 09a383314143244d37b5d40a565e75b131dff2b5 lib/galaxy/jobs/runners/__init__.py --- a/lib/galaxy/jobs/runners/__init__.py +++ b/lib/galaxy/jobs/runners/__init__.py @@ -176,7 +176,7 @@ # Append metadata setting commands, we don't want to overwrite metadata # that was copied over in init_meta(), as per established behavior - if include_metadata: + if include_metadata and job_wrapper.requires_setting_metadata: commands += "; cd %s; " % os.path.abspath( os.getcwd() ) commands += job_wrapper.setup_external_metadata( exec_dir = os.path.abspath( os.getcwd() ), diff -r 3679add0809c669e752c913ade2fc8e45adcff46 -r 09a383314143244d37b5d40a565e75b131dff2b5 lib/galaxy/tools/__init__.py --- a/lib/galaxy/tools/__init__.py +++ b/lib/galaxy/tools/__init__.py @@ -971,6 +971,7 @@ """ tool_type = 'default' + requires_setting_metadata = True default_tool_action = DefaultToolAction dict_collection_visible_keys = ( 'id', 'name', 'version', 'description' ) @@ -3134,6 +3135,8 @@ dataset. """ tool_type = 'set_metadata' + requires_setting_metadata = False + def exec_after_process( self, app, inp_data, out_data, param_dict, job = None ): for name, dataset in inp_data.iteritems(): external_metadata = JobExternalOutputMetadataWrapper( job ) 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.