Skip to content

Commit

Permalink
Merge pull request #2458 from guerler/fix_process_data
Browse files Browse the repository at this point in the history
[16.04] Filter missing inputs when processing data
  • Loading branch information
martenson committed Jun 7, 2016
2 parents 58f3f5c + b97c796 commit 37a4915
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions lib/galaxy/tools/actions/__init__.py
Expand Up @@ -7,7 +7,7 @@
from galaxy import model
from galaxy.exceptions import ObjectInvalid
from galaxy.model import LibraryDatasetDatasetAssociation
from galaxy.tools.parameters.basic import DataCollectionToolParameter, DataToolParameter
from galaxy.tools.parameters.basic import DataCollectionToolParameter, DataToolParameter, RuntimeValue
from galaxy.tools.parameters.wrapped import WrappedParameters
from galaxy.tools.parameters import update_param
from galaxy.util import ExecutionTimer
Expand Down Expand Up @@ -54,8 +54,8 @@ def collect_input_datasets( self, tool, param_values, trans, current_user_roles=
def visitor( input, value, prefix, parent=None, **kwargs ):

def process_dataset( data, formats=None ):
if not data:
return data
if not data or isinstance( data, RuntimeValue ):
return None
if formats is None:
formats = input.formats
if not data.datatype.matches_any( formats ):
Expand Down

0 comments on commit 37a4915

Please sign in to comment.