From cedfa55f474814e8077b588c298b36f8d19fef39 Mon Sep 17 00:00:00 2001 From: Andreas Kloeckner Date: Wed, 7 Sep 2016 15:42:30 -0500 Subject: [PATCH] Adjust exit status of relate validate based on warnings --- bin/relate | 12 ++++++++++-- course/validation.py | 2 ++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/bin/relate b/bin/relate index ca90b68d..f5de902e 100644 --- a/bin/relate +++ b/bin/relate @@ -12,10 +12,15 @@ def validate(args): django.setup() from course.validation import validate_course_on_filesystem - validate_course_on_filesystem(args.REPO_ROOT, + has_warnings = validate_course_on_filesystem(args.REPO_ROOT, course_file=args.course_file, events_file=args.events_file) + if has_warnings: + return 1 + else: + return 0 + # {{{ code test @@ -181,6 +186,8 @@ def test_code(args): print("EXAMINING", yml_file) test_code_yml(yml_file, repo_root=args.repo_root) + return 0 + # }}} @@ -210,7 +217,8 @@ def main(): import sys sys.exit(1) - args.func(args) + import sys + sys.exit(args.func(args)) if __name__ == "__main__": diff --git a/course/validation.py b/course/validation.py index fa7fb0f6..e4878ff7 100644 --- a/course/validation.py +++ b/course/validation.py @@ -1409,6 +1409,8 @@ def validate_course_on_filesystem( for w in warnings: print("***", w.location, w.text) + return bool(warnings) + # }}} # vim: foldmethod=marker -- GitLab