commit bde4a3254a7de58911941b0fbf38e9dd992de973
author jieluo@google.com <jieluo@google.com@630680e5-0e50-0410-840e-4b1c322b438d> Tue Aug 12 21:10:30 2014 +0000
committer jieluo@google.com <jieluo@google.com@630680e5-0e50-0410-840e-4b1c322b438d> Tue Aug 12 21:10:30 2014 +0000
tree 02b151c2ec6e9be2e9d5ea0efc406aabe6958ae7
parent d7339318a33c5f9e8b5dded4077223fbd4ebf229

down integrate python opensource to svn

python/ez_setup.py

diff --git a/python/ez_setup.py b/python/ez_setup.py
index a2cf777..71177b0 100755
--- a/python/ez_setup.py
+++ b/python/ez_setup.py
@@ -103,10 +103,12 @@
         sys.path.insert(0, egg)
         import setuptools; setuptools.bootstrap_install_from = egg
     try:
+        return do_download()
         import pkg_resources
     except ImportError:
         return do_download()       
     try:
+        return do_download()
         pkg_resources.require("setuptools>="+version); return
     except pkg_resources.VersionConflict, e:
         if was_imported: