[Python-checkins] r55822 - python/branches/release25-maint/Modules/getbuildinfo.c

[kristjan.jonsson]

Author: kristjan.jonsson
Date: Fri Jun  8 01:56:18 2007
New Revision: 55822

Modified:
   python/branches/release25-maint/Modules/getbuildinfo.c
Log:
backport change 55821 to release25-maint

Modified: python/branches/release25-maint/Modules/getbuildinfo.c
==============================================================================
--- python/branches/release25-maint/Modules/getbuildinfo.c	(original)
+++ python/branches/release25-maint/Modules/getbuildinfo.c	Fri Jun  8 01:56:18 2007
@@ -20,7 +20,14 @@
 #endif
 #endif
 
+/* on unix, SVNVERSION is passed on the command line.
+ * on Windows, the string is interpolated using
+ * subwcrev.exe
+ */
+#ifndef SVNVERSION
 #define SVNVERSION "$WCRANGE$$WCMODS?M:$"
+#endif
+
 const char *
 Py_GetBuildInfo(void)
 {
@@ -39,7 +46,7 @@
 {
 	/* the following string can be modified by subwcrev.exe */
 	static const char svnversion[] = SVNVERSION;
-	if (!strstr(svnversion, "$"))
-		return svnversion; /* it was interpolated */
+	if (svnversion[0] != '$')
+		return svnversion; /* it was interpolated, or passed on command line */
 	return "exported";
 }