Merged revisions 72874 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r72874 | benjamin.peterson | 2009-05-23 14:36:27 -0500 (Sat, 23 May 2009) | 13 lines

  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 701341aa5c25b311f43cab8f4a32f2b886204500..58f359fe4995bec9dc034c75d585bce079288053 100644 (file)
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -499,7 +499,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 d267be25381870982132099c497c395802204b46..2eadbf45be399f5cc350129bd0a1ff41eb0ba646 100644 (file)
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -684,6 +684,7 @@ Kalle Svensson
 Andrew Svetlov
 Paul Swartz
 Thenault Sylvain
+Arfrever Frehtes Taifersar Arahesis
 Geoff Talvola
 William Tanksley
 Christian Tanzer

diff --git a/Misc/NEWS b/Misc/NEWS
index 3b8aa9f8e45115c5ab8e6002ec55b042b7472061..b43d3b25878055155c08324954406c3c0018f939 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -171,6 +171,8 @@ Extension Modules
 Build
 -----
 
+- Issue #6094: Build correctly with Subversion 1.7.
+
 - Link the shared python library with $(MODLIBS).
 
 - Issue #5359: Readd the Berkley-DB detection code to allow _dbm be built

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 af960bc07001e7d28e184576a5a6613265d58a08..fbe29b247549cb76471f363a31404208755f67dd 100644 (file)
--- a/Python/sysmodule.c
+++ b/Python/sysmodule.c
@@ -1117,7 +1117,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 66824deef62ba9da6b09234330e2284be98fd9ae..ea38491aba2d97eedbf5bcd55357202d05f6577c 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 68442 .
+# From configure.in Revision: 72277 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61 for python 3.0.
 #
@@ -4288,7 +4288,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 52b4a32eca4c1f3809ba5934f957ef41c8e4a3a3..4ac2d96966f2f9d1c7ee1e31c1fe74877fe5e8c4 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -721,7 +721,7 @@ if test $SVNVERSION = found
 then
        SVNVERSION="svnversion \$(srcdir)"
 else
-       SVNVERSION="echo exported"
+       SVNVERSION="echo Unversioned directory"
 fi
 
 case $MACHDEP in