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

Merge "releasetools: merge_target_files sets verbose in main."

Browse Source
This commit is contained in:
Tao Bao
2019-08-07 02:19:01 +00:00
committed by Gerrit Code Review
parent 431096605c abb806b3f0
commit 3738f37e22
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tools/releasetools/merge_target_files.py
View File

@@ -94,7 +94,6 @@ import ota_from_target_files
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
OPTIONS = common.OPTIONS OPTIONS = common.OPTIONS
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
@@ -1057,6 +1056,9 @@ 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: