anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-09 18:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

configure.py : subprocess, second try (check_output requires

Browse Source 
python 2.7 and throws unwanted exceptions when the process
return value is not 0

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39533 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Julien Rioux 2011-08-26 23:29:37 +00:00
parent 9d8c3d018b
commit 0243eed665
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/configure.py
View File

@ -60,7 +60,9 @@ def cmdOutput(cmd):
'''utility function: run a command and get its output as a string
cmd: command to run
'''
output = subprocess.check_output(cmd, shell=True)
fout = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE).stdout
output = fout.read()
fout.close()
return output.strip()
@ -640,9 +642,14 @@ def checkConverterEntries():
checkProg('a Sweave -> R/S code converter', ['Rscript --verbose --no-save --no-restore $$s/scripts/lyxstangle.R $$i $$e $$r'],
rc_entry = [ r'\converter sweave r "%%" ""' ])
#
checkProg('an HTML -> LaTeX converter', ['html2latex $$i', 'gnuhtml2latex $$i', \
'htmltolatex -input $$i -output $$o', 'java -jar htmltolatex.jar -input $$i -output $$o'],
rc_entry = [ r'\converter html latex "%%" ""' ])
path, htmltolatex = checkProg('an HTML -> LaTeX converter', ['html2latex $$i',
'gnuhtml2latex $$i', 'htmltolatex -input $$i -output $$o', 'htmltolatex.jar'],
rc_entry = [ r'\converter html latex "%%" ""',
r'\converter html latex "%%" ""',
r'\converter html latex "%%" ""', '', ''] )
if htmltolatex == 'htmltolatex.jar':
addToRC(r'\converter html latex "java -jar %s -input $$i -output $$o" ""'
% os.path.join(path, htmltolatex))
#
checkProg('an MS Word -> LaTeX converter', ['wvCleanLatex $$i $$o'],
rc_entry = [ r'\converter word latex "%%" ""' ])