equal
deleted
inserted
replaced
126 def has_rst2html(): |
126 def has_rst2html(): |
127 return matchoutput('rst2html --version', r'^rst2html \(Docutils') or \ |
127 return matchoutput('rst2html --version', r'^rst2html \(Docutils') or \ |
128 matchoutput('rst2html.py --version', r'^rst2html.py \(Docutils') |
128 matchoutput('rst2html.py --version', r'^rst2html.py \(Docutils') |
129 |
129 |
130 def has_svn(): |
130 def has_svn(): |
131 return matchoutput('svn --version 2>&1', r'^svn, version') and \ |
131 #return matchoutput('svn --version 2>&1', r'^svn, version') and \ |
132 matchoutput('svnadmin --version 2>&1', r'^svnadmin, version') |
132 #matchoutput('svnadmin --version 2>&1', r'^svnadmin, version') |
|
133 # disabled until licensing issue is resolved |
|
134 return False |
133 |
135 |
134 def has_svn_bindings(): |
136 def has_svn_bindings(): |
135 try: |
137 try: |
136 import svn.core |
138 import svn.core |
137 version = svn.core.SVN_VER_MAJOR, svn.core.SVN_VER_MINOR |
139 version = svn.core.SVN_VER_MAJOR, svn.core.SVN_VER_MINOR |