From bde4a3254a7de58911941b0fbf38e9dd992de973 Mon Sep 17 00:00:00 2001 From: "jieluo@google.com" Date: Tue, 12 Aug 2014 21:10:30 +0000 Subject: down integrate python opensource to svn --- python/ez_setup.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'python/ez_setup.py') 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: -- cgit v1.2.3