[2.7] bpo-21060 Improve error message for "setup.py upload" without dist files (GH-5726).

merwok · Mariatta · commit eeb33651bfad · 2018-02-18T19:56:06.000-08:00
(cherry picked from commit 08a6926) Co-authored-by: Éric Araujo <merwok@netwok.org>
diff --git a/Lib/distutils/command/upload.py b/Lib/distutils/command/upload.py
@@ -55,7 +55,9 @@ def finalize_options(self):
 
     def run(self):
         if not self.distribution.dist_files:
-            raise DistutilsOptionError("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
@@ -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".

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+Rewrite confusing message from setup.py upload from`
	`2`	`+"No dist file created in earlier command" to the more helpful`
	`3`	`+"Must create and upload files in one command".`