Merge remote branch 'cros/upstream' into tempbranch3

utils/external_packages.py

 #!/usr/bin/python
 #
 # Please keep this code python 2.4 compatible and stand alone.
 
 import logging, os, shutil, sys, tempfile, time, urllib2
 import subprocess, re
 from autotest_lib.client.common_lib import utils
 
 _READ_SIZE = 64*1024
 _MAX_PACKAGE_SIZE = 100*1024*1024
@@ skipping 460 matching lines @@
             return False
 
 
 # NOTE: This class definition must come -before- all other ExternalPackage
 # classes that need to use this version of setuptools so that is is inserted
 # into the ExternalPackage.subclasses list before them.
 class SetuptoolsPackage(ExternalPackage):
     # For all known setuptools releases a string compare works for the
     # version string.  Hopefully they never release a 0.10.  (Their own
     # version comparison code would break if they did.)
-    version = '0.6c9'
+    version = '0.6c11'
     urls = ('http://pypi.python.org/packages/source/s/setuptools/'
             'setuptools-%s.tar.gz' % (version,),)
     local_filename = 'setuptools-%s.tar.gz' % version
-    hex_sum = '79086433b341f0c1df45e10d586a7d3cc25089f1'
+    hex_sum = '8d1ad6384d358c547c50c60f1bfdb3362c6c4a7d'
 
     SUDO_SLEEP_DELAY = 15
 
 
     def _build_and_install(self, install_dir):
         """Install setuptools on the system."""
         logging.info('NOTE: setuptools install does not use install_dir.')
         return self._build_and_install_from_package(install_dir)
 
 
@@ skipping 248 matching lines @@
         symlink_path = os.path.join(
                 install_dir, GwtPackage.name, self.symlink_name)
         if os.path.exists(symlink_path):
             os.remove(symlink_path)
         os.symlink(dest, symlink_path)
         return True
 
 
 if __name__ == '__main__':
     sys.exit(main())