##// END OF EJS Templates
convert: reenable SVN support after license issue solved
Patrick Mezard -
r9819:dec17728 default
parent child Browse files
Show More
@@ -22,7 +22,6 b' from common import NoRepo, MissingTool, '
22 22 from common import commandline, converter_source, converter_sink, mapfile
23 23
24 24 try:
25 raise ImportError("SVN support disabled due to license incompatibility")
26 25 from svn.core import SubversionException, Pool
27 26 import svn
28 27 import svn.client
@@ -128,10 +128,8 b' def has_rst2html():'
128 128 return False
129 129
130 130 def has_svn():
131 #return matchoutput('svn --version 2>&1', r'^svn, version') and \
132 #matchoutput('svnadmin --version 2>&1', r'^svnadmin, version')
133 # disabled until licensing issue is resolved
134 return False
131 return matchoutput('svn --version 2>&1', r'^svn, version') and \
132 matchoutput('svnadmin --version 2>&1', r'^svnadmin, version')
135 133
136 134 def has_svn_bindings():
137 135 try:
General Comments 0
You need to be logged in to leave comments. Login now