Merge "Ensure that merge_target_files.py prints INFO level logs."

This commit is contained in:
Bill Peckham
2020-04-06 19:00:56 +00:00
committed by Gerrit Code Review

View File

@@ -95,6 +95,8 @@ import ota_from_target_files
logger = logging.getLogger(__name__)
OPTIONS = common.OPTIONS
# Always turn on verbose logging.
OPTIONS.verbose = True
OPTIONS.framework_target_files = None
OPTIONS.framework_item_list = None
OPTIONS.framework_misc_info_keys = None
@@ -1109,9 +1111,6 @@ 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: