commit 4cb5468490a3f42a5412bd5f0b548231e28a1719
author Simon Glass <sjg@chromium.org> Wed Jul 19 17:49:10 2023 -0600
committer Simon Glass <sjg@chromium.org> Mon Jul 24 09:34:11 2023 -0600
tree 83bb29428c61eeaee6ac9de16e5dcc412392c940
parent d07e55323c5fe1fceca3bbf87bc7c33dbf83ae2d

buildman: Export _get_output_dir() to avoid warnings

Make this a public memory since it is used outside the class.

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

tools/buildman/builder.py

diff --git a/tools/buildman/builder.py b/tools/buildman/builder.py
index 4cc266f..ecbd368 100644
--- a/tools/buildman/builder.py
+++ b/tools/buildman/builder.py
@@ -565,7 +565,7 @@
             terminal.print_clear()
             tprint(line, newline=False, limit_to_line=True)
 
-    def _get_output_dir(self, commit_upto):
+    def get_output_dir(self, commit_upto):
         """Get the name of the output directory for a commit number
 
         The output directory is typically .../<branch>/<commit>.
@@ -598,7 +598,7 @@
             commit_upto: Commit number to use (0..self.count-1)
             target: Target name
         """
-        output_dir = self._get_output_dir(commit_upto)
+        output_dir = self.get_output_dir(commit_upto)
         if self.work_in_output:
             return output_dir
         return os.path.join(output_dir, target)
@@ -1717,7 +1717,7 @@
 
         Figure out what needs to be deleted in the output directory before it
         can be used. We only delete old buildman directories which have the
-        expected name pattern. See _get_output_dir().
+        expected name pattern. See get_output_dir().
 
         Returns:
             List of full paths of directories to remove
@@ -1726,7 +1726,7 @@
             return
         dir_list = []
         for commit_upto in range(self.commit_count):
-            dir_list.append(self._get_output_dir(commit_upto))
+            dir_list.append(self.get_output_dir(commit_upto))
 
         to_remove = []
         for dirname in glob.glob(os.path.join(self.base_dir, '*')):

tools/buildman/builderthread.py

diff --git a/tools/buildman/builderthread.py b/tools/buildman/builderthread.py
index 179fc47..45ae6ed 100644
--- a/tools/buildman/builderthread.py
+++ b/tools/buildman/builderthread.py
@@ -351,7 +351,7 @@
             return
 
         # Write the output and stderr
-        output_dir = self.builder._get_output_dir(result.commit_upto)
+        output_dir = self.builder.get_output_dir(result.commit_upto)
         mkdir(output_dir)
         build_dir = self.builder.get_build_dir(result.commit_upto,
                 result.brd.target)

tools/buildman/test.py

diff --git a/tools/buildman/test.py b/tools/buildman/test.py
index 7ac6726..bdd3d84 100644
--- a/tools/buildman/test.py
+++ b/tools/buildman/test.py
@@ -528,7 +528,7 @@
                                                    'sandbox']),
                          ({'all': ['board4'], 'sandbox': ['board4']}, []))
     def CheckDirs(self, build, dirname):
-        self.assertEqual('base%s' % dirname, build._get_output_dir(1))
+        self.assertEqual('base%s' % dirname, build.get_output_dir(1))
         self.assertEqual('base%s/fred' % dirname,
                          build.get_build_dir(1, 'fred'))
         self.assertEqual('base%s/fred/done' % dirname,