Improve tracing/logging system used in lib/naclports

build_tools/scan_packages.py

 #!/usr/bin/env python
 # Copyright (c) 2014 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.
 
 """Scan online binary packages to produce new package index.
 
 This script is indended to be run periodically and the
 results checked into source control.  This script depends on
 gsutil being installed.
 """
 
 from __future__ import print_function
 
 import argparse
 import collections
 import hashlib
 import os
 import subprocess
 import sys
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
 sys.path.append(os.path.join(os.path.dirname(SCRIPT_DIR), 'lib'))
 
 import naclports
 import naclports.package
 import naclports.package_index
 
-from naclports import Log, Trace
+from naclports.util import Log, LogVerbose
 
 
 def FormatSize(num_bytes):
   """Create a human readable string from a byte count."""
   for x in ('bytes', 'KB', 'MB', 'GB', 'TB'):
     if num_bytes < 1024.0:
       return "%3.1f %s" % (num_bytes, x)
     num_bytes /= 1024.0
 
 
@@ skipping 94 matching lines @@
                                                    args.revision)
   gs_url = 'gs://' + base_path
   listing_file = os.path.join(naclports.NACLPORTS_ROOT, 'lib', 'listing.txt')
   if args.cache_listing and os.path.exists(listing_file):
     Log('Using pre-cached gs listing: %s' % listing_file)
     with open(listing_file) as f:
       listing = f.read()
   else:
     Log("Searching for packages at: %s" % gs_url)
     cmd = ['gsutil', 'ls', '-le', gs_url]
-    Trace("Running: %s" % str(cmd))
+    LogVerbose("Running: %s" % str(cmd))
     try:
       listing = subprocess.check_output(cmd)
     except subprocess.CalledProcessError as e:
       naclports.Error(e)
       return 1
 
   all_files = ParseGsUtilLs(listing)
   if args.cache_listing and not os.path.exists(listing_file):
     with open(listing_file, 'w') as f:
       f.write(listing)
 
   Log('Found %d packages [%s]' % (len(all_files),
                                   FormatSize(sum(f.size for f in all_files))))
 
   binaries = DownloadFiles(all_files, not args.skip_md5)
   index_file = os.path.join(naclports.NACLPORTS_ROOT, 'lib', 'prebuilt.txt')
   Log('Generating %s' % index_file)
   naclports.package_index.WriteIndex(index_file, binaries)
   Log('Done')
   return 0
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv[1:]))