Author: forenr
Date: Mon Sep 13 00:23:55 2010
New Revision: 35351
URL: http://www.lyx.org/trac/changeset/35351
Log:
Fix bug #6873: Shell execution of \nonstopmode tried when no latex binary
present
Modified:
lyx-devel/branches/BRANCH_1_6_X/lib/configure.py
lyx-devel/branches/BRANCH_1_6_X/status.16x
Modified: lyx-devel/branches/BRANCH_1_6_X/lib/configure.py
==============================================================================
--- lyx-devel/branches/BRANCH_1_6_X/lib/configure.py Sun Sep 12 23:54:50
2010 (r35350)
+++ lyx-devel/branches/BRANCH_1_6_X/lib/configure.py Mon Sep 13 00:23:55
2010 (r35351)
@@ -921,10 +921,13 @@
if lyx_check_config:
print "Checking whether TeX allows spaces in file names... ",
writeToFile('a b.tex', r'\message{working^^J}' )
- if os.name == 'nt':
- latex_out = cmdOutput(LATEX + r""" "\nonstopmode\input{\"a b\"}"
""")
+ if LATEX != '':
+ if os.name == 'nt':
+ latex_out = cmdOutput(LATEX + r""" "\nonstopmode\input{\"a
b\"}" """)
+ else:
+ latex_out = cmdOutput(LATEX + r""" '\nonstopmode\input{"a b"}'
""")
else:
- latex_out = cmdOutput(LATEX + r""" '\nonstopmode\input{"a b"}' """)
+ latex_out = ''
if 'working' in latex_out:
print 'yes'
tex_allows_spaces = 'true'
Modified: lyx-devel/branches/BRANCH_1_6_X/status.16x
==============================================================================
--- lyx-devel/branches/BRANCH_1_6_X/status.16x Sun Sep 12 23:54:50 2010
(r35350)
+++ lyx-devel/branches/BRANCH_1_6_X/status.16x Mon Sep 13 00:23:55 2010
(r35351)
@@ -128,6 +128,9 @@
- Fix parsing of commands sent through the lyxserver, such that they don't
need to be terminated by a newline character (bug 6868).
+- Don't try to blindly execute the latex command if no latex binary is
+ available (bug 6873).
+
* DOCUMENTATION AND LOCALIZATION
