opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-10-28 02:58:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release_19.09' into release_20.01

Browse Source
This commit is contained in:
mvdbeek
2020-01-29 22:12:27 +01:00
parent 0940b1ec26 002964ee17
commit cc6e2aba83
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy/tools/actions/__init__.py
+3 -5
View File
@@ -360,16 +360,14 @@ class DefaultToolAction(object):
parent_to_child_pairs = []
child_dataset_names = set()
object_store_populator = ObjectStorePopulator(app)
async_tool = tool.tool_type == 'data_source_async'
def handle_output(name, output, hidden=None):
if output.parent:
parent_to_child_pairs.append((output.parent, name))
child_dataset_names.add(name)
# What is the following hack for? Need to document under what
# conditions can the following occur? (james@bx.psu.edu)
# HACK: the output data has already been created
# this happens i.e. as a result of the async controller
if name in incoming:
if async_tool and name in incoming:
# HACK: output data has already been created as a result of the async controller
dataid = incoming[name]
data = trans.sa_session.query(app.model.HistoryDatasetAssociation).get(dataid)
assert data is not None