diff options
| -rw-r--r-- | Makefile.pre.in | 2 | ||||
| -rw-r--r-- | Misc/ACKS | 1 | ||||
| -rw-r--r-- | Misc/NEWS | 2 | ||||
| -rw-r--r-- | Modules/getbuildinfo.c | 2 | ||||
| -rw-r--r-- | Python/sysmodule.c | 2 | ||||
| -rwxr-xr-x | configure | 4 | ||||
| -rw-r--r-- | configure.in | 2 |
7 files changed, 9 insertions, 6 deletions
diff --git a/Makefile.pre.in b/Makefile.pre.in index 5c5e29c..689d248 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -501,7 +501,7 @@ Modules/getbuildinfo.o: $(PARSER_OBJS) \ $(SIGNAL_OBJS) \ $(MODOBJS) \ $(srcdir)/Modules/getbuildinfo.c - $(CC) -c $(PY_CFLAGS) -DSVNVERSION=\"`LC_ALL=C $(SVNVERSION)`\" -o $@ $(srcdir)/Modules/getbuildinfo.c + $(CC) -c $(PY_CFLAGS) -DSVNVERSION="\"`LC_ALL=C $(SVNVERSION)`\"" -o $@ $(srcdir)/Modules/getbuildinfo.c Modules/getpath.o: $(srcdir)/Modules/getpath.c Makefile $(CC) -c $(PY_CFLAGS) -DPYTHONPATH='"$(PYTHONPATH)"' \ @@ -684,6 +684,7 @@ Andrew Svetlov Kalle Svensson Paul Swartz Thenault Sylvain +Arfrever Frehtes Taifersar Arahesis Geoff Talvola William Tanksley Christian Tanzer @@ -98,6 +98,8 @@ Library Build ----- +- Issue #6094: Build correctly with Subversion 1.7. + - Issue #5726: Make Modules/ld_so_aix return the actual exit code of the linker, rather than always exit successfully. Patch by Floris Bruynooghe. diff --git a/Modules/getbuildinfo.c b/Modules/getbuildinfo.c index b673f3f..f4bd14a 100644 --- a/Modules/getbuildinfo.c +++ b/Modules/getbuildinfo.c @@ -48,5 +48,5 @@ _Py_svnversion(void) static const char svnversion[] = SVNVERSION; if (svnversion[0] != '$') return svnversion; /* it was interpolated, or passed on command line */ - return "exported"; + return "Unversioned directory"; } diff --git a/Python/sysmodule.c b/Python/sysmodule.c index ff7157f..10ba1cf 100644 --- a/Python/sysmodule.c +++ b/Python/sysmodule.c @@ -1161,7 +1161,7 @@ svnversion_init(void) svnversion = _Py_svnversion(); - if (strcmp(svnversion, "exported") != 0) + if (strcmp(svnversion, "Unversioned directory") != 0 && strcmp(svnversion, "exported") != 0) svn_revision = svnversion; else if (istag) { len = strlen(_patchlevel_revision); @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Revision: 70731 . +# From configure.in Revision: 72275 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.61 for python 2.6. # @@ -4344,7 +4344,7 @@ if test $SVNVERSION = found then SVNVERSION="svnversion \$(srcdir)" else - SVNVERSION="echo exported" + SVNVERSION="echo Unversioned directory" fi case $MACHDEP in diff --git a/configure.in b/configure.in index 6730b4c..481d400 100644 --- a/configure.in +++ b/configure.in @@ -767,7 +767,7 @@ if test $SVNVERSION = found then SVNVERSION="svnversion \$(srcdir)" else - SVNVERSION="echo exported" + SVNVERSION="echo Unversioned directory" fi case $MACHDEP in |