Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-26 11:14:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

Issue #21722: The distutils "upload" command now exits with a non-zero return code when uploading fails.

Browse source 
Patch by Martin Dengler.
This commit is contained in:
Antoine Pitrou 2014-06-18 23:09:11 -04:00
commit 41dcf35c26
4 changed files with 21 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Lib/distutils/command/upload.py
View file

@ -12,7 +12,7 @@
from base64 import standard_b64encode
from urllib.request import urlopen, Request, HTTPError
from urllib.parse import urlparse
from distutils.errors import DistutilsOptionError
from distutils.errors import DistutilsError, DistutilsOptionError
from distutils.core import PyPIRCCommand
from distutils.spawn import spawn
from distutils import log
@ -184,7 +184,7 @@ def upload_file(self, command, pyversion, filename):
reason = result.msg
except OSError as e:
self.announce(str(e), log.ERROR)
return
raise
except HTTPError as e:
status = e.code
reason = e.msg
@ -193,8 +193,9 @@ def upload_file(self, command, pyversion, filename):
self.announce('Server response (%s): %s' % (status, reason),
log.INFO)
else:
self.announce('Upload failed (%s): %s' % (status, reason),
log.ERROR)
msg = 'Upload failed (%s): %s' % (status, reason)
self.announce(msg, log.ERROR)
raise DistutilsError(msg)
if self.show_response:
text = self._read_pypi_response(result)
msg = '\n'.join(('-' * 75, text, '-' * 75))