convert: reenable SVN support after license issue solved

This commit is contained in:
Patrick Mezard 2009-11-10 22:32:17 +01:00
parent 29f1e65f87
commit d8a8eb5584
2 changed files with 2 additions and 5 deletions

View File

@ -22,7 +22,6 @@ from common import NoRepo, MissingTool, commit, encodeargs, decodeargs
from common import commandline, converter_source, converter_sink, mapfile
try:
raise ImportError("SVN support disabled due to license incompatibility")
from svn.core import SubversionException, Pool
import svn
import svn.client

View File

@ -128,10 +128,8 @@ def has_rst2html():
return False
def has_svn():
#return matchoutput('svn --version 2>&1', r'^svn, version') and \
#matchoutput('svnadmin --version 2>&1', r'^svnadmin, version')
# disabled until licensing issue is resolved
return False
return matchoutput('svn --version 2>&1', r'^svn, version') and \
matchoutput('svnadmin --version 2>&1', r'^svnadmin, version')
def has_svn_bindings():
try: