Improve tracing/logging system used in lib/naclports

lib/naclports/__main__.py

 # Copyright (c) 2013 The Native Client Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Tool for manipulating naclports packages in python.
 
 This tool can be used to for working with naclports packages.
 It can also be incorporated into other tools that need to
 work with packages (e.g. 'update_mirror.py' uses it to iterate
 through all packages and mirror them on Google Cloud Storage).
@@ skipping 79 matching lines @@
   if package.VERSION not in package.URL:
     PrintError('%s: uscan only works if VERSION is embedded in URL' %
                 package.NAME)
     return 0
 
   temp_fd, temp_file = tempfile.mkstemp('naclports_watchfile')
   try:
     with os.fdopen(temp_fd, 'w') as f:
       uscan_url = package.URL.replace(package.VERSION, '(.+)')
       uscan_url = uscan_url.replace('download.sf.net', 'sf.net')
-      util.Trace('uscan pattern: %s' % uscan_url)
+      util.LogVerbose('uscan pattern: %s' % uscan_url)
       f.write("version = 3\n")
       f.write("%s\n" % uscan_url)
 
     cmd = ['uscan', '--upstream-version', package.VERSION, '--package',
            package.NAME, '--watchfile', temp_file]
-    util.Trace(' '.join(cmd))
+    util.LogVerbose(' '.join(cmd))
     rtn = subprocess.call(cmd)
   finally:
     os.remove(temp_file)
 
   return rtn
 
 
 def CmdPkgCheck(package, options):
   """Verify dependency information for given package(s)"""
   # The fact that we got this far means the pkg_info is basically valid.
@@ skipping 90 matching lines @@
   installed_pkg_commands = ['contents', 'uninstall']
 
   all_commands = dict(base_commands.items() + pkg_commands.items())
 
   epilog = "The following commands are available:\n"
   for name, function in all_commands.iteritems():
     epilog += '  %-12s - %s\n' % (name, function.__doc__)
 
   parser = argparse.ArgumentParser(prog='naclports', description=__doc__,
       formatter_class=argparse.RawDescriptionHelpFormatter, epilog=epilog)
-  parser.add_argument('-v', '--verbose', action='store_true',
-                      help='Output extra information.')
+  parser.add_argument('-v', '--verbose', dest='verbosity', action='count',
+                      default=0, help='Output extra information.')
   parser.add_argument('-V', '--verbose-build', action='store_true',
                       help='Make builds verbose (e.g. pass V=1 to make')
   parser.add_argument('--skip-sdk-version-check', action='store_true',
                       help="Disable the NaCl SDK version check on startup.")
   parser.add_argument('--all', action='store_true',
                       help='Perform action on all known ports.')
   parser.add_argument('--color', choices=('always', 'never', 'auto'),
                       help='Enabled color terminal output', default='auto')
   parser.add_argument('-f', '--force', action='store_const', const='build',
                       help='Force building specified targets, '
@@ skipping 20 matching lines @@
   # environment variable.
   parser.add_argument('--debug', action='store_const', const=True,
                       help='Build debug configuration (release is the default)')
   parser.add_argument('--arch',
                       help='Set architecture to use when building (x86_64,'
                       ' x86_32, arm, pnacl)')
   parser.add_argument('command', help="sub-command to run")
   parser.add_argument('pkg', nargs='*', help="package name or directory")
   args = parser.parse_args(args)
 
-  util.SetVerbose(args.verbose or os.environ.get('VERBOSE') == '1')
+  if not args.verbosity and os.environ.get('VERBOSE') == '1':
+    args.verbosity = 1
+
+  util.SetLogLevel(util.LOG_MESSAGE + args.verbosity)

[binji, 2015/03/17 19:28:11]

LOG_MESSAGE makes it sound like a string. Maybe LOG_LEVEL_MESSAGE?

+
   if args.verbose_build:
     os.environ['VERBOSE'] = '1'
   else:
     if 'VERBOSE' in os.environ:
       del os.environ['VERBOSE']
     if 'V' in os.environ:
       del os.environ['V']
 
   if args.skip_sdk_version_check:
     util.MIN_SDK_VERSION = -1
@@ skipping 59 matching lines @@
     return 1
   except error.Error as e:
     PrintError(str(e))
     return 1
 
   return 0
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv[1:]))