StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ensure that merge_target_files.py prints INFO level logs.

Browse Source 
Bug: 153166596
Test: Run a merge build, inspect logs.
Change-Id: Ic2795f26922db32030c7ab7eb4ec6f153c1e9654
This commit is contained in:
Bill Peckham
2020-04-03 12:50:47 -07:00
parent 0447be9904
commit cb84817fdf
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tools/releasetools/merge_target_files.py
View File

@@ -95,6 +95,8 @@ import ota_from_target_files
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
OPTIONS = common.OPTIONS OPTIONS = common.OPTIONS
# Always turn on verbose logging.
OPTIONS.verbose = True
OPTIONS.framework_target_files = None OPTIONS.framework_target_files = None
OPTIONS.framework_item_list = None OPTIONS.framework_item_list = None
OPTIONS.framework_misc_info_keys = None OPTIONS.framework_misc_info_keys = None
@@ -1109,9 +1111,6 @@ def main():
common.Usage(__doc__) common.Usage(__doc__)
sys.exit(1) sys.exit(1)
# Always turn on verbose logging.
OPTIONS.verbose = True
if OPTIONS.framework_item_list: if OPTIONS.framework_item_list:
framework_item_list = common.LoadListFromFile(OPTIONS.framework_item_list) framework_item_list = common.LoadListFromFile(OPTIONS.framework_item_list)
else: else: