From 6c210b19bb1b10907a5641a9f304d8695e47b52f Mon Sep 17 00:00:00 2001 From: Stan Lagun Date: Mon, 16 Jun 2014 20:39:48 +0400 Subject: [PATCH] Return and Break were broken BreakException and ReturnException were wrapped in MuranoPlException similar to other python exceptions. So they were never catch by the code that expects them and thus those macros didn't work Change-Id: I1a4e766a1f8a9926768acec24f09b5e7b0eb169a --- murano/dsl/macros.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/murano/dsl/macros.py b/murano/dsl/macros.py index 2369c8a59..2274dd865 100644 --- a/murano/dsl/macros.py +++ b/murano/dsl/macros.py @@ -37,7 +37,9 @@ class CodeBlock(expressions.DslExpression): def action(): try: expr.execute(context, murano_class) - except dsl_exception.MuranoPlException: + except (dsl_exception.MuranoPlException, + exceptions.BreakException, + exceptions.ReturnException): raise except Exception as ex: raise dsl_exception.MuranoPlException.\