commit 1df181583a2b2ef4e742460708e7a4922e94a66f
author Cheng Yueh <cyueh@chromium.org> Wed Mar 31 18:17:37 2021 +0800
committer Commit Bot <commit-bot@chromium.org> Thu Apr 01 15:14:35 2021 +0000
tree a4533324fd5d0be2821de151dee93a2099baac60
parent 49287ca3530a45eecba4e17a7e79af5bde0a3646

installer: Add quiet option

I don't want to show contents when building toolkits.

BUG=None
TEST=`make toolkit QUIET=1` without printing contents

Change-Id: I19421385424583723b55500fb3f90f48b6f23ea7
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/factory/+/2797131
Tested-by: Cheng Yueh <cyueh@chromium.org>
Reviewed-by: Jian-Jia Su <jjsu@chromium.org>
Commit-Queue: Cheng Yueh <cyueh@chromium.org>

py/toolkit/installer.py

diff --git a/py/toolkit/installer.py b/py/toolkit/installer.py
index b8fb757..8c1da15 100755
--- a/py/toolkit/installer.py
+++ b/py/toolkit/installer.py
@@ -329,7 +329,7 @@
   print(file_utils.ReadFile(info_file))
 
 
-def PackFactoryToolkit(src_root, output_path, initial_version):
+def PackFactoryToolkit(src_root, output_path, initial_version, quiet=False):
   """Packs the files containing this script into a factory toolkit."""
   if initial_version is None:
     complete_version = '%s  repacked by %s@%s at %s\n' % (
@@ -358,13 +358,13 @@
            # executable.
            'env', 'PYTHONPATH=' + PYTHONPATH,
            'python3', '-m', INSTALLER_MODULE, '--in-exe']
-    Spawn(cmd, check_call=True, log=True)
+    Spawn(cmd, check_call=True, log=True, read_stdout=quiet, read_stderr=quiet)
   with file_utils.TempDirectory() as tmp_dir:
     version_path = os.path.join(tmp_dir, VERSION_PATH)
     os.makedirs(os.path.dirname(version_path))
     file_utils.WriteFile(version_path, complete_version)
     Spawn([cmd[0], '--lsm', version_path, '--append', tmp_dir, output_path],
-          check_call=True, log=True)
+          check_call=True, log=True, read_stdout=quiet, read_stderr=quiet)
   print('\n'
         '  Factory toolkit generated at %s.\n'
         '\n'
@@ -455,6 +455,8 @@
   parser.add_argument('--active-test-list', dest='active_test_list',
                       default=None,
                       help='Set the id of active test list for Goofy.')
+  parser.add_argument('--quiet', action='store_true',
+                      help='Do not output makeself.sh log when success.')
 
   args = parser.parse_args()
 
@@ -469,7 +471,7 @@
   # --pack-into may be called directly so this must be done before changing
   # working directory to OLDPWD.
   if args.pack_into and args.repack is None:
-    PackFactoryToolkit(src_root, args.pack_into, args.version)
+    PackFactoryToolkit(src_root, args.pack_into, args.version, args.quiet)
     return
 
   if not in_archive:
@@ -488,8 +490,10 @@
       parser.error('Must specify --pack-into when using --repack.')
     env = dict(os.environ,
                PYTHONPATH=os.path.join(args.repack, PYTHONPATH))
-    Spawn(['python3', '-m', INSTALLER_MODULE, '--pack-into', args.pack_into],
-          check_call=True, log=True, env=env)
+    cmd = ['python3', '-m', INSTALLER_MODULE, '--pack-into', args.pack_into]
+    if args.quiet:
+      cmd.append('--quiet')
+    Spawn(cmd, check_call=True, log=True, env=env)
     return
 
   if args.build_info: