anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-24 13:48:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Consider file encoding for modules in reconfigure

Browse Source 
If the modules are not in utf8 then we warn and skip that file
like it happens for layout files.

This a port of commit a8094051c1 to stable.
This commit is contained in:
José Matos 2020-08-15 21:02:38 +01:00
parent 65c8e70588
commit f548903630
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/configure.py
View File

@ -228,7 +228,7 @@ def checkTeXPaths():
if sys.version_info[0] < 3: if sys.version_info[0] < 3:
inpname = shortPath(unicode(tmpfname, encoding)).replace('\\', '/') inpname = shortPath(unicode(tmpfname, encoding)).replace('\\', '/')
else: else:
inpname = shortPath(tmpfname).replace('\\', '/') inpname = shortPath(tmpfname).replace('\\', '/')
else: else:
inpname = cmdOutput('cygpath -m ' + tmpfname) inpname = cmdOutput('cygpath -m ' + tmpfname)
logname = os.path.basename(re.sub("(?i).ltx", ".log", inpname)) logname = os.path.basename(re.sub("(?i).ltx", ".log", inpname))
@ -1174,7 +1174,7 @@ def checkConverterEntries():
\converter svgz png "%%" ""'''], \converter svgz png "%%" ""'''],
path = ['', inkscape_path]) path = ['', inkscape_path])
# #
checkProg('Gnuplot', ['gnuplot'], checkProg('Gnuplot', ['gnuplot'],
rc_entry = [ r'''\Format gnuplot "gp, gnuplot" "Gnuplot" "" "" "" "vector" "text/plain" rc_entry = [ r'''\Format gnuplot "gp, gnuplot" "Gnuplot" "" "" "" "vector" "text/plain"
\converter gnuplot pdf6 "python -tt $$s/scripts/gnuplot2pdf.py $$i $$o" "needauth"''' ]) \converter gnuplot pdf6 "python -tt $$s/scripts/gnuplot2pdf.py $$i $$o" "needauth"''' ])
# #
@ -1584,9 +1584,17 @@ def checkModulesConfig():
continue continue
seen.append(filename) seen.append(filename)
retval = processModuleFile(file, filename, bool_docbook) try:
if retval: retval = processModuleFile(file, filename, bool_docbook)
tx.write(retval) if retval:
tx.write(retval)
except UnicodeDecodeError:
logger.warning("**************************************************\n"
"Module file '%s'\n"
"cannot be decoded in utf-8.\n"
"Please check if the file has the correct encoding.\n"
"Skipping this file!\n"
"**************************************************" % filename)
tx.close() tx.close()
logger.info('\tdone') logger.info('\tdone')

6
status.23x
View File

@ -88,7 +88,7 @@ What's new
- Do not allow editing of math package list in Document > Settings > Math Options, - Do not allow editing of math package list in Document > Settings > Math Options,
thus preventing a crash (bug 11931). thus preventing a crash (bug 11931).
- Maintain standard layout for separating paragraphs when switching layouts (bug 11936). - Maintain standard layout for separating paragraphs when switching layouts (bug 11936).
@ -114,3 +114,7 @@ What's new
- Wininstaller, fix bug where previous installations, with emergency version - Wininstaller, fix bug where previous installations, with emergency version
greater than 1, could not be seen in registry on overinstall greater than 1, could not be seen in registry on overinstall
- Do not break configuration if a module file is not decodable (file
not encoded in utf-8). Rather than that, issue a warning and skip
that file (a variant of bug 11736).