diff options
| -rw-r--r-- | bootstrap.py | 8 | ||||
| -rw-r--r-- | tests/install_test.py | 11 |
2 files changed, 14 insertions, 5 deletions
diff --git a/bootstrap.py b/bootstrap.py index abb73c97..a861c584 100644 --- a/bootstrap.py +++ b/bootstrap.py @@ -19,6 +19,7 @@ import shutil import time import fnmatch from distutils import log +from distutils.errors import DistutilsError is_jython = sys.platform.startswith('java') if is_jython: @@ -31,7 +32,7 @@ except ImportError: DEFAULT_VERSION = "0.6" #DEFAULT_URL = "http://pypi.python.org/packages/%s/d/distribute/" % sys.version[:3] -DEFAULT_URL = "http://bitbucket.org/tarek/distribute/downloads/" +DEFAULT_URL = "http://nightly.ziade.org/" md5_data = { 'distribute-0.6-py2.3.egg': '83789f9a3b2f32c7088065f6fd3de930', @@ -307,7 +308,10 @@ def main(argv, version=DEFAULT_VERSION): ) sys.exit(2) from setuptools.command import easy_install - return easy_install.main(list(argv)+['-v']+[egg]) + try: + return easy_install.main(list(argv)+['-v']+[egg]) + except DistutilsError: + return sys.exit(2) finally: if egg and os.path.exists(egg): os.unlink(egg) diff --git a/tests/install_test.py b/tests/install_test.py index 56ab13cc..e2d86ec2 100644 --- a/tests/install_test.py +++ b/tests/install_test.py @@ -22,9 +22,14 @@ f.close() # running it args = [sys.executable] + ['bootstrap.py'] if is_jython: - subprocess.Popen([sys.executable] + args).wait() + res = subprocess.call([sys.executable] + args) else: - os.spawnv(os.P_WAIT, sys.executable, args) + res = os.spawnv(os.P_WAIT, sys.executable, args) + +if res != 0: + print '**** Test failed, please send me the output at tarek@ziade.org' + os.remove('bootstrap.py') + sys.exit(2) # now checking if Distribute is installed script = """\ @@ -52,7 +57,7 @@ finally: f.close() try: - args = [sys.executable] + ['script.py'] + args = [sys.executable] + [script_name] if is_jython: res = subprocess.call([sys.executable] + args) else: |