[Erp5-report] r41105 kazuhiko - in /erp5/trunk/utils/pysvn: Source/setup_configure.py setup.py

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Fri Dec  3 16:49:02 2010
New Revision: 41105

URL: http://svn.erp5.org?rev=41105&view=rev
Log:
pysvn-1.7.4nxd005
* svnadmin is not mandatory.

Modified:
    erp5/trunk/utils/pysvn/Source/setup_configure.py
    erp5/trunk/utils/pysvn/setup.py

Modified: erp5/trunk/utils/pysvn/Source/setup_configure.py
URL: http://svn.erp5.org/erp5/trunk/utils/pysvn/Source/setup_configure.py?rev=41105&r1=41104&r2=41105&view=diff
==============================================================================
--- erp5/trunk/utils/pysvn/Source/setup_configure.py [utf8] (original)
+++ erp5/trunk/utils/pysvn/Source/setup_configure.py [utf8] Fri Dec  3 16:49:02 2010
@@ -315,7 +315,7 @@ class MakeFileCreater:
             'python_platform':  distutils.util.get_platform(),
 
             # pysvn version:
-            'pysvn_version':    '%(MAJOR)s.%(MINOR)s.%(PATCH)snxd004' % pysvn_version_info,
+            'pysvn_version':    '%(MAJOR)s.%(MINOR)s.%(PATCH)snxd005' % pysvn_version_info,
 
             # mac arch options
             'mac_os_x_arch':    self.mac_os_x_arch
@@ -823,7 +823,8 @@ LDLIBS= \
                     'svn_client.h' )
 
     def find_svn_bin( self ):
-        return self.find_dir(
+        try:
+            return self.find_dir(
                     'SVN bin',
                     '--svn-bin-dir',
                     'bin',
@@ -835,6 +836,9 @@ LDLIBS= \
                         '/usr/pkg/bin',        # netbsd
                     ],
                     'svnadmin' )
+        except SetupError:
+            # svnadmin is only required for test
+            return ''
 
     def find_svn_lib( self ):
         dir = self.find_dir(

Modified: erp5/trunk/utils/pysvn/setup.py
URL: http://svn.erp5.org/erp5/trunk/utils/pysvn/setup.py?rev=41105&r1=41104&r2=41105&view=diff
==============================================================================
--- erp5/trunk/utils/pysvn/setup.py [utf8] (original)
+++ erp5/trunk/utils/pysvn/setup.py [utf8] Fri Dec  3 16:49:02 2010
@@ -56,7 +56,7 @@ name = "pysvn"
 
 setuptools.setup(
     name = name,
-    version='%(MAJOR)s.%(MINOR)s.%(PATCH)snxd004' % pysvn_version_info,
+    version='%(MAJOR)s.%(MINOR)s.%(PATCH)snxd005' % pysvn_version_info,
     author="Barry Scott",
     author_email="barryscott at tigris.org",
     description="Subversion support for Python",