Merge "releasetools: merge_target_files sets verbose in main." am: 3738f37e22 (d08461c8) · Commits · e / os / android_build

tools/releasetools/merge_target_files.py

+3 −1

Original line number	Diff line number	Diff line
		@@ -94,7 +94,6 @@ import ota_from_target_files
		logger = logging.getLogger(__name__)

		OPTIONS = common.OPTIONS
		OPTIONS.verbose = True
		OPTIONS.framework_target_files = None
		OPTIONS.framework_item_list = None
		OPTIONS.framework_misc_info_keys = None
		@@ -1057,6 +1056,9 @@ def main():
		common.Usage(__doc__)
		sys.exit(1)

		# Always turn on verbose logging.
		OPTIONS.verbose = True

		if OPTIONS.framework_item_list:
		framework_item_list = common.LoadListFromFile(OPTIONS.framework_item_list)
		else: