aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan H. Holek <stefan@epy.co.at>2012-10-19 11:02:50 +0200
committerStefan H. Holek <stefan@epy.co.at>2012-10-19 11:02:50 +0200
commitacdb434b3d3748bbbadf18bdf259fa08df695cfb (patch)
tree336360aaa7c41466ea2d8c645cbd076f32918b1a
parent0a1a4cdedb6bfd3e1fc2121275dd765c597e33ed (diff)
parent13d0d367f40c0f7cf943cbbe959166fa5aee844c (diff)
downloadexternal_python_setuptools-acdb434b3d3748bbbadf18bdf259fa08df695cfb.tar.gz
external_python_setuptools-acdb434b3d3748bbbadf18bdf259fa08df695cfb.tar.bz2
external_python_setuptools-acdb434b3d3748bbbadf18bdf259fa08df695cfb.zip
Merged in g2p/distribute (pull request #23)
--HG-- branch : distribute extra : rebase_source : 44f0858ff1b3ae5f8a283c433a95d513340d807d
-rw-r--r--distribute_setup.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/distribute_setup.py b/distribute_setup.py
index a52d5c16..04c9864b 100644
--- a/distribute_setup.py
+++ b/distribute_setup.py
@@ -86,6 +86,8 @@ def _install(tarball, install_args=()):
if not _python_cmd('setup.py', 'install', *install_args):
log.warn('Something went wrong during the installation.')
log.warn('See the error message above.')
+ # exitcode will be 2
+ return 2
finally:
os.chdir(old_wd)
@@ -529,7 +531,7 @@ def main(version=DEFAULT_VERSION):
"""Install or upgrade setuptools and EasyInstall"""
options = _parse_args()
tarball = download_setuptools(download_base=options.download_base)
- _install(tarball, _build_install_args(options))
+ return _install(tarball, _build_install_args(options))
if __name__ == '__main__':
- main()
+ sys.exit(main())