convert: unbreak non-svn engines
authorBrendan Cully <brendan@kublai.com>
Wed, 30 Sep 2009 14:43:22 -0700
changeset 9490 67df9f46f907
parent 9489 cec4b0d3fb02
child 9491 12e340b9f1bf
child 9534 8e202431d620
convert: unbreak non-svn engines
hgext/convert/subversion.py
tests/hghave
--- a/hgext/convert/subversion.py	Sat Sep 26 00:17:55 2009 +0300
+++ b/hgext/convert/subversion.py	Wed Sep 30 14:43:22 2009 -0700
@@ -22,7 +22,7 @@
 from common import commandline, converter_source, converter_sink, mapfile
 
 try:
-    raise "SVN support disabled due to license incompatibility"
+    raise ImportError("SVN support disabled due to license incompatibility")
     from svn.core import SubversionException, Pool
     import svn
     import svn.client
--- a/tests/hghave	Sat Sep 26 00:17:55 2009 +0300
+++ b/tests/hghave	Wed Sep 30 14:43:22 2009 -0700
@@ -128,8 +128,10 @@
         matchoutput('rst2html.py --version', r'^rst2html.py \(Docutils')
 
 def has_svn():
-    return matchoutput('svn --version 2>&1', r'^svn, version') and \
-        matchoutput('svnadmin --version 2>&1', r'^svnadmin, version')
+    #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
 
 def has_svn_bindings():
     try: