1 new commit in galaxy-central:

https://bitbucket.org/galaxy/galaxy-central/commits/b852505038a8/ Changeset: b852505038a8 User: Jeremy Goecks Date: 2014-05-02 22:32:38 Summary: Put converted datasets in history and add note to merge copied converter code. Affected #: 2 files

diff -r 41bb60076082ea46686a4bb9db8cb593b8f35851 -r b852505038a8c3a05d0320ad7d00dccf7969a864 lib/galaxy/model/__init__.py --- a/lib/galaxy/model/__init__.py +++ b/lib/galaxy/model/__init__.py @@ -1564,8 +1564,7 @@ raise NoConverterException("A dependency (%s) is missing a converter." % dependency) except KeyError: pass # No deps - new_dataset = self.datatype.convert_dataset( trans, self, target_ext, return_output=True, visible=False, deps=deps, set_output_history=False ).values()[0] - new_dataset.name = self.name + new_dataset = self.datatype.convert_dataset( trans, self, target_ext, return_output=True, visible=False, deps=deps, set_output_history=True ).values()[0] assoc = ImplicitlyConvertedDatasetAssociation( parent=self, file_type=target_ext, dataset=new_dataset, metadata_safe=False ) session = trans.sa_session session.add( new_dataset )

diff -r 41bb60076082ea46686a4bb9db8cb593b8f35851 -r b852505038a8c3a05d0320ad7d00dccf7969a864 lib/galaxy/tools/actions/__init__.py --- a/lib/galaxy/tools/actions/__init__.py +++ b/lib/galaxy/tools/actions/__init__.py @@ -50,6 +50,7 @@ if converted_dataset: data = converted_dataset else: + # FIXME: merge with hda.get_converted_dataset() mode as it's nearly identical. #run converter here new_data = data.datatype.convert_dataset( trans, data, target_ext, return_output=True, visible=False ).values()[0] new_data.hid = data.hid

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.