Merge remote branch 'origin/upstream' into tempbranch

utils/build_externals.py

 #!/usr/bin/python
 #
 # Please keep this code python 2.4 compatible and stand alone.
 
 """
 Fetch, build and install external Python library dependancies.
 
 This fetches external python libraries, builds them using your host's
 python and installs them under our own autotest/site-packages/ directory.
 
 Usage?  Just run it.
     utils/build_externals.py
 """
 
-import compileall, logging, os, sha, shutil, sys, tempfile, time, urllib2
+import compileall, logging, os, shutil, sys, tempfile, time, urllib2
 import subprocess, re
 import common
 from autotest_lib.client.common_lib import logging_config, logging_manager
 from autotest_lib.client.common_lib import utils
 from autotest_lib.utils import external_packages
 
 # bring in site packages as well
 utils.import_site_module(__file__, 'autotest_lib.utils.site_external_packages')
 
 # Where package source be fetched to relative to the top of the autotest tree.
@@ skipping 51 matching lines @@
     # for the source code before checking the directory of the .pyc file.
     # Don't leave references to our temporary build dir in the files.
     logging.info('compiling .py files in %s to .pyc', install_dir)
     compileall.compile_dir(install_dir, quiet=True)
 
     # Some things install with whacky permissions, fix that.
     external_packages.system("chmod -R a+rX '%s'" % install_dir)
 
     errors = fetch_errors + install_errors
     for error_msg in errors:
-        print >>sys.stderr, error_msg
+        logging.error(error_msg)
 
     return len(errors)
 
 
 def fetch_necessary_packages(dest_dir, install_dir):
     """
     Fetches all ExternalPackages into dest_dir.
 
     @param dest_dir: Directory the packages should be fetched into.
     @param install_dir: Directory where packages will later installed.
@@ skipping 11 matching lines @@
         if names_to_check and package.name.lower() not in names_to_check:
             continue
         if not package.is_needed(install_dir):
             logging.info('A new %s is not needed on this system.',
                          package.name)
             if INSTALL_ALL:
                 logging.info('Installing anyways...')
             else:
                 continue
         if not package.fetch(dest_dir):
-            msg = '!!! Unable to download %s' % package.name
-            print msg
+            msg = 'Unable to download %s' % package.name
+            logging.error(msg)
             errors.append(msg)
         else:
             fetched_packages.append(package)
 
     return fetched_packages, errors
 
 
 def build_and_install_packages(packages, install_dir):
     """
     Builds and installs all packages into install_dir.
 
     @param packages - A list of already fetched ExternalPackage instances.
     @param install_dir - Directory the packages should be installed into.
 
     @returns A list of error messages for any installs that failed.
     """
     errors = []
     for package in packages:
         if not package.build_and_install(install_dir):
-            msg = '!!! Unable to build and install %s' % package.name
-            print msg
+            msg = 'Unable to build and install %s' % package.name
+            logging.error(msg)
             errors.append(msg)
     return errors
 
 
 if __name__ == '__main__':
     sys.exit(main())