equal
deleted
inserted
replaced
119 |
119 |
120 def has_git(): |
120 def has_git(): |
121 return matchoutput('git --version 2>&1', r'^git version') |
121 return matchoutput('git --version 2>&1', r'^git version') |
122 |
122 |
123 def has_rst2html(): |
123 def has_rst2html(): |
124 return matchoutput('rst2html --version 2>&1', r'^rst2html \(Docutils') or \ |
124 for name in ('rst2html', 'rst2html.py'): |
125 matchoutput('rst2html.py --version 2>&1', r'^rst2html.py \(Docutils') |
125 name = name + ' --version 2>&1' |
|
126 if matchoutput(name, r'^rst2html(?:\.py)? \(Docutils'): |
|
127 return True |
|
128 return False |
126 |
129 |
127 def has_svn(): |
130 def has_svn(): |
128 #return matchoutput('svn --version 2>&1', r'^svn, version') and \ |
131 #return matchoutput('svn --version 2>&1', r'^svn, version') and \ |
129 #matchoutput('svnadmin --version 2>&1', r'^svnadmin, version') |
132 #matchoutput('svnadmin --version 2>&1', r'^svnadmin, version') |
130 # disabled until licensing issue is resolved |
133 # disabled until licensing issue is resolved |