From: Simon Glass <sjg@chromium.org>
Date: Wed, 19 Jul 2023 23:49:00 +0000 (-0600)
Subject: buildman: Create a function to get number of built commits
X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=1d0c55d83a3cf1724e1283cf5a59d19a233b8da2;p=u-boot.git

buildman: Create a function to get number of built commits

Move this code into a function. This removes the last pylint error in
the control module.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

diff --git a/tools/buildman/control.py b/tools/buildman/control.py
index b388d760ba..3a9454cd79 100644
--- a/tools/buildman/control.py
+++ b/tools/buildman/control.py
@@ -29,7 +29,24 @@ def get_plural(count):
     """Returns a plural 's' if count is not 1"""
     return 's' if count != 1 else ''
 
-def get_action_summary(is_summary, commits, selected, step, threads, jobs):
+
+def count_build_commits(commits, step):
+    """Calculate the number of commits to be built
+
+    Args:
+        commits (list of Commit): Commits to build or None
+        step (int): Step value for commits, typically 1
+
+    Returns:
+        Number of commits that will be built
+    """
+    if commits:
+        count = len(commits)
+        return (count + step - 1) // step
+    return 0
+
+
+def get_action_summary(is_summary, commit_count, selected, threads, jobs):
     """Return a string summarising the intended action.
 
     Args:
@@ -43,10 +60,8 @@ def get_action_summary(is_summary, commits, selected, step, threads, jobs):
     Returns:
         Summary string.
     """
-    if commits:
-        count = len(commits)
-        count = (count + step - 1) // step
-        commit_str = f'{count} commit{get_plural(count)}'
+    if commit_count:
+        commit_str = f'{commit_count} commit{get_plural(commit_count)}'
     else:
         commit_str = 'current source'
     msg = (f"{'Summary of' if is_summary else 'Building'} "
@@ -83,8 +98,8 @@ def show_actions(series, why_selected, boards_selected, output_dir,
         commits = series.commits
     else:
         commits = None
-    print(get_action_summary(False, commits, boards_selected, step, threads,
-                             jobs))
+    print(get_action_summary(False, count_build_commits(commits, step),
+                             boards_selected, threads, jobs))
     print(f'Build directory: {output_dir}')
     if commits:
         for upto in range(0, len(series.commits), step):
@@ -494,8 +509,9 @@ def run_builder(builder, commits, board_selected, options):
     builder.gnu_make = gnu_make
 
     if not options.ide:
-        tprint(get_action_summary(options.summary, commits, board_selected,
-                                  options.step, options.threads, options.jobs))
+        commit_count = count_build_commits(commits, options.step)
+        tprint(get_action_summary(options.summary, commit_count, board_selected,
+                                  options.threads, options.jobs))
 
     builder.SetDisplayOptions(
         options.show_errors, options.show_sizes, options.show_detail,