Improve error message for "setup.py upload" without dist files (GH-21060)
(cherry picked from commit 08a6926b2584040fe3c3f06263b0b5f1fbbdc24c)
Co-authored-by: Éric Araujo <merwok@netwok.org>
diff --git a/Lib/distutils/command/upload.py b/Lib/distutils/command/upload.py
index f7752f9..32dda35 100644
--- a/Lib/distutils/command/upload.py
+++ b/Lib/distutils/command/upload.py
@@ -57,7 +57,8 @@
def run(self):
if not self.distribution.dist_files:
- msg = "No dist file created in earlier command"
+ msg = ("Must create and upload files in one command "
+ "(e.g. setup.py sdist upload)")
raise DistutilsOptionError(msg)
for command, pyversion, filename in self.distribution.dist_files:
self.upload_file(command, pyversion, filename)
diff --git a/Misc/NEWS.d/next/Library/2018-02-17-19-20-19.bpo-21060.S1Z-x6.rst b/Misc/NEWS.d/next/Library/2018-02-17-19-20-19.bpo-21060.S1Z-x6.rst
new file mode 100644
index 0000000..4e0a113
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2018-02-17-19-20-19.bpo-21060.S1Z-x6.rst
@@ -0,0 +1,3 @@
+Rewrite confusing message from setup.py upload from
+"No dist file created in earlier command" to the more helpful
+"Must create and upload files in one command".