From 4bc832fb7d4afb1f7ed8be231e05f561240b4a56 Mon Sep 17 00:00:00 2001 From: Thomas Herve Date: Thu, 1 May 2014 12:31:40 +0200 Subject: [PATCH] Fix exit code of validate-templates script We didn't propagate the error properly in validate-templates, thus exiting with 0 even when an error happened. We could also get a None value when parsing environment files. Change-Id: I005b1491c82db9d389b6176125563811ab2c83ba --- tools/validate-templates | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/validate-templates b/tools/validate-templates index b2f181dc..6c1e2835 100755 --- a/tools/validate-templates +++ b/tools/validate-templates @@ -20,14 +20,14 @@ def main(args): dirs.remove(excluded) for name in files: if name.endswith((".yaml", ".template")): - got_error = validate(root, name) + got_error = validate(root, name) or got_error sys.exit(int(got_error)) def validate(base, name): basename, ext = os.path.splitext(name) if basename.endswith("_env"): - return + return False args = ["heat", "template-validate", "-f", os.path.join(base, name)] base_env = "%s_env%s" % (basename, ext) env = os.path.join(base, base_env)