From 413233eec3ce9b3f930db8e40413856831dfc0cb Mon Sep 17 00:00:00 2001 From: mvdbeek Date: Sat, 19 Aug 2017 10:42:43 +0200 Subject: [PATCH] Correctly raise Exception if invocation not found --- lib/galaxy/managers/workflows.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/lib/galaxy/managers/workflows.py b/lib/galaxy/managers/workflows.py index 2f3d72a64ae..4743d75996e 100644 --- a/lib/galaxy/managers/workflows.py +++ b/lib/galaxy/managers/workflows.py @@ -116,12 +116,13 @@ class WorkflowsManager(object): return True def get_invocation(self, trans, decoded_invocation_id): - try: - workflow_invocation = trans.sa_session.query( - self.app.model.WorkflowInvocation - ).get(decoded_invocation_id) - except Exception: - raise exceptions.ObjectNotFound() + workflow_invocation = trans.sa_session.query( + self.app.model.WorkflowInvocation + ).get(decoded_invocation_id) + if not workflow_invocation: + encoded_wfi_id = trans.security.encode_id(decoded_invocation_id) + message = "'%s' is not a valid workflow invocation id" % encoded_wfi_id + raise exceptions.ObjectNotFound(message) self.check_security(trans, workflow_invocation, check_ownership=True, check_accessible=False) return workflow_invocation