commit 179a242caa31ca4b96ada240fa6a6fef7509aa27
author Mike Frysinger <vapier@google.com> Mon Mar 01 02:03:44 2021 -0500
committer Mike Frysinger <vapier@google.com> Mon Mar 01 15:57:32 2021 +0000
tree b5bcdddac211f1eeaf66a2278b2b3c40b37fec7f
parent 31fabeed54f3cbf9495e559dce60f58e126f58d5

forall: move nested func out to the class

This is in preparation for simplifying the jobs support.  The nested
function is referenced in the options object which can't be pickled,
so pull it out into a static method instead.

Change-Id: I01d3c4eaabcb8b8775ddf22312a6e142c84cb77d
Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/298722
Reviewed-by: Michael Mortensen <mmortensen@google.com>
Tested-by: Mike Frysinger <vapier@google.com>

subcmds/forall.py

diff --git a/subcmds/forall.py b/subcmds/forall.py
index 4ea7db6..a2ccb7b 100644
--- a/subcmds/forall.py
+++ b/subcmds/forall.py
@@ -115,13 +115,15 @@
 """
   PARALLEL_JOBS = DEFAULT_LOCAL_JOBS
 
+  @staticmethod
+  def _cmd_option(option, _opt_str, _value, parser):
+    setattr(parser.values, option.dest, list(parser.rargs))
+    while parser.rargs:
+      del parser.rargs[0]
+
   def _Options(self, p):
     super()._Options(p)
 
-    def cmd(option, opt_str, value, parser):
-      setattr(parser.values, option.dest, list(parser.rargs))
-      while parser.rargs:
-        del parser.rargs[0]
     p.add_option('-r', '--regex',
                  dest='regex', action='store_true',
                  help="Execute the command only on projects matching regex or wildcard expression")
@@ -136,7 +138,7 @@
                  help='Command (and arguments) to execute',
                  dest='command',
                  action='callback',
-                 callback=cmd)
+                 callback=self._cmd_option)
     p.add_option('-e', '--abort-on-errors',
                  dest='abort_on_errors', action='store_true',
                  help='Abort if a command exits unsuccessfully')