From c27a01e2936af5faeace539afb27f3103962d114 Mon Sep 17 00:00:00 2001 From: mvdbeek Date: Wed, 18 Nov 2020 19:35:24 +0100 Subject: [PATCH 1/2] Include dataset and state in valid state exception --- lib/galaxy/tools/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/galaxy/tools/__init__.py b/lib/galaxy/tools/__init__.py index 3ce0fe07254..06057173d7b 100644 --- a/lib/galaxy/tools/__init__.py +++ b/lib/galaxy/tools/__init__.py @@ -2773,7 +2773,7 @@ class DatabaseOperationTool(Tool): if self.require_dataset_ok: if input_dataset.state != input_dataset.dataset.states.OK: - raise ValueError("Tool requires inputs to be in valid state.") + raise ValueError("Tool requires inputs to be in valid state, but {} is in state '{}".format(input_dataset, input_dataset.state)) for input_dataset in input_datasets.values(): check_dataset_instance(input_dataset) From 40e20a40f1a0c0307cb81a08483599ed4c2bf41c Mon Sep 17 00:00:00 2001 From: Marius van den Beek Date: Wed, 18 Nov 2020 19:43:50 +0100 Subject: [PATCH 2/2] Better exception message Co-authored-by: Nicola Soranzo --- lib/galaxy/tools/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/galaxy/tools/__init__.py b/lib/galaxy/tools/__init__.py index 06057173d7b..1ab8813d2fa 100644 --- a/lib/galaxy/tools/__init__.py +++ b/lib/galaxy/tools/__init__.py @@ -2773,7 +2773,7 @@ class DatabaseOperationTool(Tool): if self.require_dataset_ok: if input_dataset.state != input_dataset.dataset.states.OK: - raise ValueError("Tool requires inputs to be in valid state, but {} is in state '{}".format(input_dataset, input_dataset.state)) + raise ValueError("Tool requires inputs to be in valid state, but dataset {} is in state '{}'".format(input_dataset, input_dataset.state)) for input_dataset in input_datasets.values(): check_dataset_instance(input_dataset)