From 38f10700dc5bb2b749725566d0a299b4db6d9f21 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Martin=20v=2E=20L=C3=B6wis?= Date: Sun, 30 Jul 2006 13:34:47 +0000 Subject: [PATCH] Backport r50856: 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. --- Tools/buildbot/kill_python.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/Tools/buildbot/kill_python.c b/Tools/buildbot/kill_python.c index ca905f571399..023ff2deffca 100644 --- a/Tools/buildbot/kill_python.c +++ b/Tools/buildbot/kill_python.c @@ -42,8 +42,19 @@ int main() _strlwr(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) || - (strstr(path, "build\\python.exe") != NULL)) { + (strstr(path, "\\build\\python.exe") != NULL)) { printf("Terminating %s (pid %d)\n", path, pids[i]); if (!TerminateProcess(hProcess, 1)) { printf("Termination failed: %d\n", GetLastError()); -- 2.47.3