Merge "releasetools: Don't write outputs if not in verbose mode." (a514c4ec) · Commits · e / os / android_build

tools/releasetools/ota_from_target_files.py

+14 −5

Original line number	Diff line number	Diff line
		@@ -517,7 +517,7 @@ class PayloadSigner(object):
		"""Signs the given input file. Returns the output filename."""
		out_file = common.MakeTempFile(prefix="signed-", suffix=".bin")
		cmd = [self.signer] + self.signer_args + ['-in', in_file, '-out', out_file]
		common.RunAndCheckOutput(cmd, stdout=None, stderr=None)
		common.RunAndCheckOutput(cmd)
		return out_file


		@@ -539,6 +539,15 @@ class Payload(object):
		self.payload_properties = None
		self.secondary = secondary

		def _Run(self, cmd):
		# Don't pipe (buffer) the output if verbose is set. Let
		# brillo_update_payload write to stdout/stderr directly, so its progress can
		# be monitored.
		if OPTIONS.verbose:
		common.RunAndCheckOutput(cmd, stdout=None, stderr=None)
		else:
		common.RunAndCheckOutput(cmd)

		def Generate(self, target_file, source_file=None, additional_args=None):
		"""Generates a payload from the given target-files zip(s).

		@@ -559,7 +568,7 @@ class Payload(object):
		if source_file is not None:
		cmd.extend(["--source_image", source_file])
		cmd.extend(additional_args)
		common.RunAndCheckOutput(cmd, stdout=None, stderr=None)
		self._Run(cmd)

		self.payload_file = payload_file
		self.payload_properties = None
		@@ -583,7 +592,7 @@ class Payload(object):
		"--signature_size", str(payload_signer.key_size),
		"--metadata_hash_file", metadata_sig_file,
		"--payload_hash_file", payload_sig_file]
		common.RunAndCheckOutput(cmd, stdout=None, stderr=None)
		self._Run(cmd)

		# 2. Sign the hashes.
		signed_payload_sig_file = payload_signer.Sign(payload_sig_file)
		@@ -598,7 +607,7 @@ class Payload(object):
		"--signature_size", str(payload_signer.key_size),
		"--metadata_signature_file", signed_metadata_sig_file,
		"--payload_signature_file", signed_payload_sig_file]
		common.RunAndCheckOutput(cmd, stdout=None, stderr=None)
		self._Run(cmd)

		# 4. Dump the signed payload properties.
		properties_file = common.MakeTempFile(prefix="payload-properties-",
		@@ -606,7 +615,7 @@ class Payload(object):
		cmd = ["brillo_update_payload", "properties",
		"--payload", signed_payload_file,
		"--properties_file", properties_file]
		common.RunAndCheckOutput(cmd, stdout=None, stderr=None)
		self._Run(cmd)

		if self.secondary:
		with open(properties_file, "a") as f: