From: Kristján Valur Jónsson <kristjan@ccpgames.com>
Date: Thu, 7 Jun 2007 23:56:18 +0000 (+0000)
Subject: backport change 55821 to release25-maint
X-Git-Tag: v2.5.2c1~274
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b11197045aa9ae96774adeb760fdc82f42d6999b;p=thirdparty%2FPython%2Fcpython.git

backport change 55821 to release25-maint
---

diff --git a/Modules/getbuildinfo.c b/Modules/getbuildinfo.c
index 0f71ca03d0a5..b673f3f98d41 100644
--- a/Modules/getbuildinfo.c
+++ b/Modules/getbuildinfo.c
@@ -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 @@ _Py_svnversion(void)
 {
 	/* 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";
 }