On Tue, Mar 29, 2011 at 8:26 PM, <jri...@lyx.org> wrote:

> Author: jrioux
> Date: Wed Mar 30 02:26:19 2011
> New Revision: 38142
> URL: http://www.lyx.org/trac/changeset/38142
>
> Log:
> fix checkTeXPaths when no latex is found
> (reallows the install of LyX without MikTeX again under windows)
>
> Modified:
>   lyx-devel/trunk/lib/configure.py
>
> Modified: lyx-devel/trunk/lib/configure.py
>
> ==============================================================================
> --- lyx-devel/trunk/lib/configure.py    Wed Mar 30 02:24:15 2011
>  (r38141)
> +++ lyx-devel/trunk/lib/configure.py    Wed Mar 30 02:26:19 2011
>  (r38142)
> @@ -96,6 +96,8 @@
>  def checkTeXPaths():
>     ''' Determine the path-style needed by the TeX engine on Win32 (Cygwin)
> '''
>     windows_style_tex_paths = ''
> +    if LATEX == '':
> +        return windows_style_tex_paths
>     if os.name == 'nt' or sys.platform == 'cygwin':
>         from tempfile import mkstemp
>         fd, tmpfname = mkstemp(suffix='.ltx')
> @@ -1340,7 +1342,6 @@
>         sys.exit(1)
>     setEnviron()
>     createDirectories()
> -    windows_style_tex_paths = checkTeXPaths()
>     dtl_tools = checkDTLtools()
>     ## Write the first part of outfile
>     writeToFile(outfile, '''# This file has been automatically generated by
> LyX' lib/configure.py
> @@ -1356,6 +1357,7 @@
>     checkConverterEntries()
>     (chk_docbook, bool_docbook, docbook_cmd) = checkDocBook()
>     checkTeXAllowSpaces()
> +    windows_style_tex_paths = checkTeXPaths()
>     if windows_style_tex_paths != '':
>         addToRC(r'\tex_expects_windows_paths %s' % windows_style_tex_paths)
>     checkOtherEntries()
>

for branch?

Reply via email to