pack_firmware: Remove mute_output usages.
The mute_output argument to run is being removed because it is
redundant. The functionality is already covered by the existing
quiet usage.
BUG=chromium:1067680
TEST=None
Change-Id: I481f02ef63887c553ae16c6e837cddf058b70c45
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/firmware/+/2140153
Tested-by: Alex Klein <saklein@chromium.org>
Reviewed-by: Hung-Te Lin <hungte@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Commit-Queue: Alex Klein <saklein@chromium.org>
diff --git a/pack_firmware.py b/pack_firmware.py
index ba67dd0..b25f108 100755
--- a/pack_firmware.py
+++ b/pack_firmware.py
@@ -72,7 +72,6 @@
class PackError(Exception):
"""Exception returned by FirmwarePacker when something goes wrong"""
- pass
class FirmwarePacker(object):
@@ -757,7 +756,7 @@
self._CopyFile(self._sfx_file, self._args.output, mode=CHMOD_ALL_EXEC)
cros_build_lib.run(
['sh', self._args.output, '--repack', self._basedir],
- quiet=self._args.quiet, mute_output=not self._args.quiet)
+ quiet=self._args.quiet, capture_output=self._args.quiet)
if not self._args.quiet:
for fname in glob.glob(self._BaseDirPath('VERSION*')):
print(osutils.ReadFile(fname))
@@ -994,7 +993,7 @@
image_args = [args.bios_image, args.ec_image, args.pd_image]
if any(image_args) and not args.local:
raise PackError('Cannot use -b/-p/-e with -m')
- elif args.local and not any(image_args):
+ if args.local and not any(image_args):
raise PackError('Must provide one of -b, -e, -p with -l')
if not args.config:
raise PackError('Missing master configuration file (use -c)')
diff --git a/pack_firmware_functest.py b/pack_firmware_functest.py
index 87d783f..f92d1f5 100755
--- a/pack_firmware_functest.py
+++ b/pack_firmware_functest.py
@@ -172,7 +172,7 @@
os.environ['FILESDIR'] = 'test'
self.packer.Start(argv)
cros_build_lib.run([outfile, '--unpack', self.unpackdir],
- quiet=True, mute_output=True)
+ quiet=True, capture_output=True)
files = []
for dirpath, _, fnames in os.walk(self.unpackdir):
for fname in fnames:
@@ -400,7 +400,7 @@
# Extract the file into a directory, then overwrite various files with new
# images with a different IDs.
cros_build_lib.run([outfile, '--unpack', self.unpackdir],
- quiet=True, mute_output=True)
+ quiet=True, capture_output=True)
ro_id = 'Google_Veyron_Mickey.6588.197.0'
rw_id = 'Google_Veyron_Mickey.6588.197.1'
ec_id = 'GoogleEC_Veyron_Mickey.6588.197.0'
@@ -412,7 +412,7 @@
# Repack the file and make sure that the versions update.
cros_build_lib.run([outfile, '--repack', self.unpackdir],
- quiet=True, mute_output=True)
+ quiet=True, capture_output=True)
versions = pack_firmware_utils.ReadVersions(outfile)
self.assertEqual(ro_id, versions['TARGET_RO_FWID'])
self.assertEqual(rw_id, versions['TARGET_FWID'])
@@ -489,7 +489,7 @@
expect = self._GetVblock(sig_id, basename[-1])
elif expect_root_sum and basename == 'GBB':
result = cros_build_lib.run(
- ['futility', 'show', fname], quiet=True, mute_output=True,
+ ['futility', 'show', fname], quiet=True, capture_output=True,
check=False, encoding='utf-8')
# Relevant output is:
# Root Key:
@@ -575,8 +575,7 @@
self._CopyVblock(keydir, sig_id, 'A')
self._CopyVblock(keydir, sig_id, 'B')
result = cros_build_lib.run(
- ['futility', 'show', rootkey], quiet=True, mute_output=True,
- encoding='utf-8')
+ ['futility', 'show', rootkey], quiet=True, encoding='utf-8')
# The last output line has the following format:
# Key sha1sum: ac7c01b1bea84da486f30a52bba5eb67ff45f50f
@@ -613,13 +612,11 @@
Returns:
List of sums for each key in key_ids
"""
- cros_build_lib.run([outfile, '--unpack', self.unpackdir],
- quiet=True, mute_output=True)
+ cros_build_lib.run([outfile, '--unpack', self.unpackdir], quiet=True)
keydir = os.path.join(self.unpackdir, 'keyset')
osutils.SafeMakedirs(keydir)
key_sums = [self._AddKeys(keydir, x) for x in key_ids]
- cros_build_lib.run([outfile, '--repack', self.unpackdir],
- quiet=True, mute_output=True)
+ cros_build_lib.run([outfile, '--repack', self.unpackdir], quiet=True)
return key_sums
def testSignedFirmwareOutput(self):
