Merged revisions 72871-72872 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r72871 | benjamin.peterson | 2009-05-23 14:24:37 -0500 (Sat, 23 May 2009) | 1 line

  support building with subversion 1.7 #6094
........
  r72872 | benjamin.peterson | 2009-05-23 14:31:02 -0500 (Sat, 23 May 2009) | 1 line

  reorder name
........

diff --git a/Makefile.pre.in b/Makefile.pre.in
index 5c5e29c37b6d1fc2b050c38633fe8aefcfe58235..689d248f405987bd0cc6c35f222266819e01a92d 100644 (file)
--- 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)"' \

diff --git a/Misc/ACKS b/Misc/ACKS
index 9573698c4a29b1f55940941531a1438e0d9590f4..e0890e869540487fc0bb7c6a4738cecc915c3a34 100644 (file)
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -684,6 +684,7 @@ Andrew Svetlov
 Kalle Svensson
 Paul Swartz
 Thenault Sylvain
+Arfrever Frehtes Taifersar Arahesis
 Geoff Talvola
 William Tanksley
 Christian Tanzer

diff --git a/Misc/NEWS b/Misc/NEWS
index 018854b8c382099931891280207636909d660fe8..6fdbd0bcb2fdb94035028252e7473c998082098f 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -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 b673f3f98d4150a2993dcd37fa5e8eaf07d2ce7d..f4bd14aa930ca8e8f8df18e7412c79ea433d04a4 100644 (file)
--- 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 ff7157fc65033a8cb36ee0d61fb6ec13c53e0c32..10ba1cf668d38c3e29b41fb82b148c37b1b12122 100644 (file)
--- 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);

diff --git a/configure b/configure
index 67725d74aff6a19db1382fe87f49bcd851242c70..69f15ac8c352cf7674582fafe8bb9e9aeea117b7 100755 (executable)
--- a/configure
+++ b/configure
@@ -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 6730b4c9f51a84ab09c8197462c0a9fc43d007b5..481d400224524f2f0e78e0e941dff963189f26f6 100644 (file)
--- 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