diff options
| author | jieluo@google.com <jieluo@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2014-08-12 21:10:30 +0000 |
|---|---|---|
| committer | jieluo@google.com <jieluo@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2014-08-12 21:10:30 +0000 |
| commit | bde4a3254a7de58911941b0fbf38e9dd992de973 (patch) | |
| tree | 02b151c2ec6e9be2e9d5ea0efc406aabe6958ae7 /python/ez_setup.py | |
| parent | d7339318a33c5f9e8b5dded4077223fbd4ebf229 (diff) | |
| download | protobuf-bde4a3254a7de58911941b0fbf38e9dd992de973.tar.gz protobuf-bde4a3254a7de58911941b0fbf38e9dd992de973.tar.bz2 protobuf-bde4a3254a7de58911941b0fbf38e9dd992de973.zip | |
down integrate python opensource to svn
Diffstat (limited to 'python/ez_setup.py')
| -rwxr-xr-x | python/ez_setup.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/python/ez_setup.py b/python/ez_setup.py index a2cf777d..71177b00 100755 --- a/python/ez_setup.py +++ b/python/ez_setup.py @@ -103,10 +103,12 @@ def use_setuptools( 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: |