# HG changeset patch # User Augie Fackler # Date 1451581462 18000 # Node ID 460332aafe7d5e888c1af8e5343104ece3a504d2 # Parent 3c213ca49f7e688c9290ff4de0f906f60eec7986 swig: change current_bindings to subversion_version This makes the version tuple the same between swig and subvertpy, which will be used to detect too-new-for-stupid-mode bindings. diff --git a/hgsubversion/svnwrap/svn_swig_wrapper.py b/hgsubversion/svnwrap/svn_swig_wrapper.py --- a/hgsubversion/svnwrap/svn_swig_wrapper.py +++ b/hgsubversion/svnwrap/svn_swig_wrapper.py @@ -22,19 +22,19 @@ try: from svn import delta from svn import ra - current_bindings = (core.SVN_VER_MAJOR, core.SVN_VER_MINOR, - core.SVN_VER_MICRO) + subversion_version = (core.SVN_VER_MAJOR, core.SVN_VER_MINOR, + core.SVN_VER_MICRO) except ImportError: raise ImportError('Subversion %d.%d.%d or later required, ' 'but no bindings were found' % required_bindings) -if current_bindings < required_bindings: # pragma: no cover +if subversion_version < required_bindings: # pragma: no cover raise ImportError('Subversion %d.%d.%d or later required, ' 'but bindings for %d.%d.%d found' % - (required_bindings + current_bindings)) + (required_bindings + subversion_version)) def version(): - return '%d.%d.%d' % current_bindings, 'SWIG' + return '%d.%d.%d' % subversion_version, 'SWIG' # exported values ERR_FS_ALREADY_EXISTS = core.SVN_ERR_FS_ALREADY_EXISTS