opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release_16.04' into dev

Browse Source
This commit is contained in:
Nicola Soranzo
2016-05-12 20:06:11 +01:00
parent 366056c0b7 e28d305f3c
commit bf7996087e
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy/tools/evaluation.py
+2 -2
View File
@@ -224,7 +224,7 @@ class ToolEvaluator( object ):
real_path = dataset.file_name
if real_path in input_dataset_paths:
wrapper_kwds[ "dataset_path" ] = input_dataset_paths[ real_path ]
identifier_key = param_dict[ "identifier_key" ].get( dataset, None )
identifier_key = identifier_key_dict.get(dataset, None)
if identifier_key:
element_identifier = param_dict.get(identifier_key, None)
if element_identifier:
@@ -256,7 +256,7 @@ class ToolEvaluator( object ):
# tools where the inputs don't even get passed through. These
# tools (e.g. UCSC) should really be handled in a special way.
if self.tool.check_values:
param_dict[ "identifier_key" ] = dict((v, "%s|__identifier__" % k) for k, v in input_datasets.iteritems()) # allows lookup of identifier through HDA.
identifier_key_dict = dict((v, "%s|__identifier__" % k) for k, v in input_datasets.iteritems()) # allows lookup of identifier through HDA.
self.__walk_inputs( self.tool.inputs, param_dict, wrap_input )
def __populate_input_dataset_wrappers(self, param_dict, input_datasets, input_dataset_paths):