Merge remote branch 'cros/upstream' into master

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 595 matching lines @@
     hex_sum = '5baa64c73e966b57fa797040585c760c502dc70b'
 
     _build_and_install = ExternalPackage._build_and_install_from_package
     _build_and_install_current_dir = (
             ExternalPackage._build_and_install_current_dir_noegg)
 
 
 class ParamikoPackage(ExternalPackage):
     version = '1.7.5'
     local_filename = 'paramiko-%s.tar.gz' % version
-    urls = ('http://www.lag.net/paramiko/download/' + local_filename,)
+    urls = ('http://www.lag.net/paramiko/download/' + local_filename,
+            'ftp://mirrors.kernel.org/gentoo/distfiles/' + local_filename,)
     hex_sum = '592be7a08290070b71da63a8e6f28a803399e5c5'
 
 
     _build_and_install = ExternalPackage._build_and_install_from_package
 
 
     def _check_for_pycrypto(self):
         # NOTE(gps): Linux distros have better python-crypto packages than we
         # can easily get today via a wget due to the library's age and staleness
         # yet many security and behavior bugs are fixed by patches that distros
@@ skipping 117 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())