[libcamera-devel] [PATCH v2 2/6] checkstyle: Exit with 1 status if issues are found

Niklas Söderlund niklas.soderlund at ragnatech.se
Fri Jan 17 22:30:24 CET 2020


Hi Nicolas,

Thanks for your work.

On 2020-01-17 14:17:29 -0500, Nicolas Dufresne wrote:
> From: Nicolas Dufresne <nicolas.dufresne at collabora.com>
> 
> 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 at collabora.com>

Reviewed-by: Niklas Söderlund <niklas.soderlund at ragnatech.se>

> ---
>  utils/checkstyle.py | 9 ++++++---
>  1 file changed, 6 insertions(+), 3 deletions(-)
>  mode change 100755 => 100644 utils/checkstyle.py
> 
> diff --git a/utils/checkstyle.py b/utils/checkstyle.py
> old mode 100755
> new mode 100644
> index 7edea25..e7375b3
> --- 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,12 @@ 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
> +    return min(issues, 1)
>  
>  
>  if __name__ == '__main__':
> -- 
> 2.24.1
> 
> _______________________________________________
> libcamera-devel mailing list
> libcamera-devel at lists.libcamera.org
> https://lists.libcamera.org/listinfo/libcamera-devel

-- 
Regards,
Niklas Söderlund


More information about the libcamera-devel mailing list