From: Neal Norwitz <nnorwitz@gmail.com>
Date: Thu, 27 Jul 2006 03:51:58 +0000 (+0000)
Subject: Don't kill a normal instance of python running on windows when checking
X-Git-Tag: v2.5b3~144
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e4abc232d54b1361120de0393f9f0447188b1639;p=python

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.
---

diff --git a/Tools/buildbot/kill_python.c b/Tools/buildbot/kill_python.c
index ca905f5713..023ff2deff 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());