commit 3738f37e22672483f2bcc0d684c8577dedb8a1d1
author Tao Bao <tbao@google.com> Wed Aug 07 02:19:01 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Aug 07 02:19:01 2019 +0000
tree 9e7af1b0d9ed9c152d448a9e40b2ced3b7dc75f2
parent 431096605c6a35a87b2bf8da1134c1f1e6c793b8
parent abb806b3f0836993946382564b03cef5a72d6486

Merge "releasetools: merge_target_files sets verbose in main."

tools/releasetools/merge_target_files.py

diff --git a/tools/releasetools/merge_target_files.py b/tools/releasetools/merge_target_files.py
index 81b95c8..cfffbc7 100755
--- a/tools/releasetools/merge_target_files.py
+++ b/tools/releasetools/merge_target_files.py
@@ -94,7 +94,6 @@
 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 @@
     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: