From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Tue, 20 Nov 2018 21:48:34 +0000 (-0800)
Subject: bpo-34532: Fixed exit code for py.exe list versions arg (GH-9039)
X-Git-Tag: v3.7.2rc1~117
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=129642a1ff6a2f55933186b2303c307d58b710eb;p=thirdparty%2FPython%2Fcpython.git

bpo-34532: Fixed exit code for py.exe list versions arg (GH-9039)

(cherry picked from commit c8fe9ccf7bfbcf9a2cb48e3b6abacf6ec0e5e58d)

Co-authored-by: Brendan Gerrity <brerrity@gmail.com>
---

diff --git a/Misc/NEWS.d/next/Windows/2018-09-03-01-23-52.bpo-34532.N1HEbE.rst b/Misc/NEWS.d/next/Windows/2018-09-03-01-23-52.bpo-34532.N1HEbE.rst
new file mode 100644
index 000000000000..812b47497c2d
--- /dev/null
+++ b/Misc/NEWS.d/next/Windows/2018-09-03-01-23-52.bpo-34532.N1HEbE.rst
@@ -0,0 +1 @@
+Fixes exit code of list version arguments for py.exe.
diff --git a/PC/launcher.c b/PC/launcher.c
index eb3433ab53fe..7d666aae4ab1 100644
--- a/PC/launcher.c
+++ b/PC/launcher.c
@@ -1453,7 +1453,7 @@ show_python_list(wchar_t ** argv)
         fwprintf(stderr, L"\n\nCan't find a Default Python.\n\n");
     else
         fwprintf(stderr, L"\n\n"); /* End with a blank line */
-    return(FALSE); /* If this has been called we cannot continue */
+    return FALSE; /* If this has been called we cannot continue */
 }
 
 static int
@@ -1600,11 +1600,12 @@ process(int argc, wchar_t ** argv)
     else {
         p = argv[1];
         plen = wcslen(p);
-        if ((argc == 2) && 
-            (!wcsncmp(p, L"-0", wcslen(L"-0")) || /* Starts with -0 or --list */
+        if ((argc == 2) && // list version args
+            (!wcsncmp(p, L"-0", wcslen(L"-0")) ||
             !wcsncmp(p, L"--list", wcslen(L"--list"))))
         {
-            valid = show_python_list(argv); /* Check for -0 or --list FIRST */
+            show_python_list(argv);
+            return rc;
         }
         valid = valid && (*p == L'-') && validate_version(&p[1]);
         if (valid) {