From: Kristján Valur Jónsson <kristjan@ccpgames.com>
Date: Thu, 7 Jun 2007 23:53:49 +0000 (+0000)
Subject: Fixing changes to getbuildinfo.c that broke linux builds
X-Git-Tag: v2.6a1~1648
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b53940f238c55c8b715301e6b5902ef2d15cfefa;p=python

Fixing changes to getbuildinfo.c that broke linux builds
---

diff --git a/Modules/getbuildinfo.c b/Modules/getbuildinfo.c
index 0f71ca03d0..b673f3f98d 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";
 }