Improve tracing/logging system used in lib/naclports

lib/naclports/package.py

 # 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.
 
 import os
 
-from naclports.util import Trace, Log, Warn
+from naclports.util import Log, Warn, LogVerbose
 from naclports.error import Error
 from naclports import configuration, pkg_info, util
 
 EXTRA_KEYS = ['BUILD_CONFIG', 'BUILD_ARCH', 'BUILD_TOOLCHAIN',
               'BUILD_SDK_VERSION', 'BUILD_NACLPORTS_REVISION']
 
 
 def RemoveEmptyDirs(dirname):
   """Recursively remove a directoy and its parents if they are empty."""
   while not os.listdir(dirname):
@@ skipping 135 matching lines @@
     with open(self.GetListFile()) as f:
       for line in f:
         yield line.strip()
 
   def DoUninstall(self):
     with util.InstallLock(self.config):
       RemoveFile(self.GetInstallStamp())
 
       root = util.GetInstallRoot(self.config)
       for filename in self.Files():
-        filename = os.path.join(root, filename)
-        if not os.path.lexists(filename):
-          Warn('File not found while uninstalling: %s' % filename)
+        fullname = os.path.join(root, filename)
+        if not os.path.lexists(fullname):
+          Warn('File not found while uninstalling: %s' % fullname)
           continue
-        Trace('rm %s' % filename)
-        RemoveFile(filename)
+        LogVerbose('uninstall: %s' % filename)
+        RemoveFile(fullname)
 
       RemoveFile(self.GetListFile())
 
 
 def InstalledPackageIterator(config):
   stamp_root = util.GetInstallStampRoot(config)
   if not os.path.exists(stamp_root):
     return
 
   for filename in os.listdir(stamp_root):
     if os.path.splitext(filename)[1] != '.info':
       continue
     yield InstalledPackage(os.path.join(stamp_root, filename))
 
 
 def CreateInstalledPackage(package_name, config=None):
   stamp_root = util.GetInstallStampRoot(config)
   info_file = os.path.join(stamp_root, package_name + '.info')
   if not os.path.exists(info_file):
     raise Error('package not installed: %s [%s]' % (package_name, config))
   return InstalledPackage(info_file)