Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3738f37e authored by Tao Bao's avatar Tao Bao Committed by Gerrit Code Review
Browse files

Merge "releasetools: merge_target_files sets verbose in main."

parents 43109660 abb806b3

tools/releasetools/merge_target_files.py

+3 −1
Original line number Original line Diff line number Diff line
@@ -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: