traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

This commit is contained in:
Brendan Gerrity 2018-11-20 13:28:27 -08:00 committed by Steve Dower
parent b1dede3ee3
commit c8fe9ccf7b
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Misc/NEWS.d/next/Windows/2018-09-03-01-23-52.bpo-34532.N1HEbE.rst Normal file
View File

@ -0,0 +1 @@
Fixes exit code of list version arguments for py.exe.

9
PC/launcher.c
View File

@ -1454,7 +1454,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
@ -1601,11 +1601,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) {