Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Don't kill a normal instance of python running on windows when checking 

to kill a cygwin instance.  build\\python.exe was matching a normal windows
instance.  Prefix that with a \\ to ensure build is a directory and not
PCbuild.  As discussed on python-dev.
This commit is contained in:
Neal Norwitz 2006-07-27 03:51:58 +00:00
parent bc24eee333
commit e4abc232d5
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Tools/buildbot/kill_python.c
View File

@ -42,8 +42,19 @@ int main()
_strlwr(path); _strlwr(path);
/* printf("%s\n", path); */ /* printf("%s\n", path); */
/* Check if we are running a buildbot version of Python.
On Windows, this will always be a debug build from the
PCbuild directory. build\\PCbuild\\python_d.exe
On Cygwin, the pathname is similar to other Unixes.
Use \\build\\python.exe to ensure we don't match
PCbuild\\python.exe which could be a normal instance
of Python running on vanilla Windows.
*/
if ((strstr(path, "build\\pcbuild\\python_d.exe") != NULL) || if ((strstr(path, "build\\pcbuild\\python_d.exe") != NULL) ||
(strstr(path, "build\\python.exe") != NULL)) { (strstr(path, "\\build\\python.exe") != NULL)) {
printf("Terminating %s (pid %d)\n", path, pids[i]); printf("Terminating %s (pid %d)\n", path, pids[i]);
if (!TerminateProcess(hProcess, 1)) { if (!TerminateProcess(hProcess, 1)) {
printf("Termination failed: %d\n", GetLastError()); printf("Termination failed: %d\n", GetLastError());