Rev 1245: Use wrapped API for svn version. in http://people.samba.org/bzr/jelmer/bzr-svn/0.4

Jelmer Vernooij jelmer at samba.org
Sat Jun 21 17:05:11 BST 2008


At http://people.samba.org/bzr/jelmer/bzr-svn/0.4

------------------------------------------------------------
revno: 1245
revision-id: jelmer at samba.org-20080621160510-eehv5pu62512f9tv
parent: jelmer at samba.org-20080619153347-eysgz8ci9hvjr5r3
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Sat 2008-06-21 18:05:10 +0200
message:
  Use wrapped API for svn version.
modified:
  auth.py                        auth.py-20071209174622-w8d42k6nm5yhxvi8-1
  ra.py                          ra.py-20080615005305-t5221niknu8rm6bt-1
=== modified file 'auth.py'
--- a/auth.py	2008-06-19 13:58:42 +0000
+++ b/auth.py	2008-06-21 16:05:10 +0000
@@ -20,7 +20,6 @@
 
 from bzrlib.plugins.svn import ra
 
-import svn.core
 import urlparse
 import urllib
 
@@ -168,7 +167,8 @@
     # rather than prompting the user.
     providers = get_stock_svn_providers()
 
-    if svn.core.SVN_VER_MAJOR == 1 and svn.core.SVN_VER_MINOR >= 5:
+    (major, minor, patch, tag) = ra.version()
+    if major == 1 and minor >= 5:
         providers += auth_config.get_svn_auth_providers()
         providers += [get_ssl_client_cert_pw_provider(1)]
 

=== modified file 'ra.py'
--- a/ra.py	2008-06-19 14:06:37 +0000
+++ b/ra.py	2008-06-21 16:05:10 +0000
@@ -520,4 +520,7 @@
             raise NotImplementedError(self.reparent)
 
 
+def version():
+    ver = svn.ra.svn_ra_version()
+    return (ver.major, ver.minor, ver.patch, ver.tag)
 




More information about the bazaar-commits mailing list