1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/changeset/a6f7e5024f40/ changeset: a6f7e5024f40 user: dan date: 2011-11-07 17:19:07 summary: Fix for implicit dataset conversion that was broken in 1827729ed37e. affected #: 2 files diff -r 545288e40ee10ed48d422eb772b734ace1422451 -r a6f7e5024f40ae2cb177c636e52c46962a3f0d91 lib/galaxy/datatypes/display_applications/parameters.py --- a/lib/galaxy/datatypes/display_applications/parameters.py +++ b/lib/galaxy/datatypes/display_applications/parameters.py @@ -94,13 +94,11 @@ if target_ext and not converted_dataset: if isinstance( data, DisplayDataValueWrapper ): data = data.value - assoc = trans.app.model.ImplicitlyConvertedDatasetAssociation( parent = data, file_type = target_ext, metadata_safe = False ) new_data = data.datatype.convert_dataset( trans, data, target_ext, return_output = True, visible = False ).values()[0] new_data.hid = data.hid new_data.name = data.name trans.sa_session.add( new_data ) - trans.sa_session.flush() - assoc.dataset = new_data + assoc = trans.app.model.ImplicitlyConvertedDatasetAssociation( parent = data, file_type = target_ext, dataset = new_data, metadata_safe = False ) trans.sa_session.add( assoc ) trans.sa_session.flush() elif converted_dataset and converted_dataset.state == converted_dataset.states.ERROR: diff -r 545288e40ee10ed48d422eb772b734ace1422451 -r a6f7e5024f40ae2cb177c636e52c46962a3f0d91 lib/galaxy/tools/actions/__init__.py --- a/lib/galaxy/tools/actions/__init__.py +++ b/lib/galaxy/tools/actions/__init__.py @@ -43,13 +43,11 @@ data = converted_dataset else: #run converter here - assoc = trans.app.model.ImplicitlyConvertedDatasetAssociation( parent = data, file_type = target_ext, metadata_safe = False ) new_data = data.datatype.convert_dataset( trans, data, target_ext, return_output = True, visible = False ).values()[0] new_data.hid = data.hid new_data.name = data.name trans.sa_session.add( new_data ) - trans.sa_session.flush() - assoc.dataset = new_data + assoc = trans.app.model.ImplicitlyConvertedDatasetAssociation( parent = data, file_type = target_ext, dataset = new_data, metadata_safe = False ) trans.sa_session.add( assoc ) trans.sa_session.flush() data = new_data 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.