diff options
| author | Nicolas Dufresne <nicolas.dufresne@collabora.com> | 2020-01-18 15:00:11 -0500 |
|---|---|---|
| committer | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2020-01-18 22:05:03 +0200 |
| commit | 0b86152a573ac188aef9f2fd1decfbf312271c8e (patch) | |
| tree | fdb0ed6a55d1b1492397f975bfcb8db36ad0decb | |
| parent | 3e0c32f99284145430b89ec95ebc012eba64984d (diff) | |
checkstyle: Exit with 1 status if issues are found
Makes the tool return 1 if there is any potential issues. This is
needed when using this tool for pre-commit hook in order to abort
the commit process.
Signed-off-by: Nicolas Dufresne <nicolas.dufresne@collabora.com>
Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
| -rwxr-xr-x | utils/checkstyle.py | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/utils/checkstyle.py b/utils/checkstyle.py index 7edea25f..4a14309f 100755 --- a/utils/checkstyle.py +++ b/utils/checkstyle.py @@ -541,7 +541,7 @@ def check_style(top_level, commit): files = [f for f in files if len([p for p in patterns if fnmatch.fnmatch(os.path.basename(f), p)])] if len(files) == 0: print("Commit doesn't touch source files, skipping") - return + return 0 issues = 0 for f in files: @@ -554,6 +554,8 @@ def check_style(top_level, commit): print("%u potential style %s detected, please review" % \ (issues, 'issue' if issues == 1 else 'issues')) + return issues + def extract_revlist(revs): """Extract a list of commits on which to operate from a revision or revision @@ -632,11 +634,15 @@ def main(argv): revlist = extract_revlist(args.revision_range) + issues = 0 for commit in revlist: - check_style(top_level, commit) + issues += check_style(top_level, commit) print('') - return 0 + if issues: + return 1 + else: + return 0 if __name__ == '__main__': |