mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-22 01:59:02 +00:00
Reduce the mix of python versions in configure.py in case of running it with python3
This commit is contained in:
parent
6372f5569e
commit
77670bc998
@ -1293,7 +1293,7 @@ def checkConverterEntries():
|
||||
if lilypond_book:
|
||||
found_lilypond_book = False
|
||||
# On Windows, the file lilypond-book is not directly callable, it must be passed as argument to python.
|
||||
for cmd in ["lilypond-book", "python \"" + path + "/lilypond-book\""]:
|
||||
for cmd in ["lilypond-book", os.path.basename(sys.executable) + ' "' + path + '/lilypond-book"']:
|
||||
version_string = cmdOutput(cmd + " --version")
|
||||
if len(version_string) == 0:
|
||||
continue
|
||||
@ -1331,9 +1331,8 @@ def checkConverterEntries():
|
||||
|
||||
logger.info('+ found LilyPond-book version %s.' % version_number)
|
||||
|
||||
# early exit on first match, avoid 2nd try with problematic python call
|
||||
# 1) in case of configure.py called with "python3" hardcoded "python" call is wrong
|
||||
# 2) in case of lilypond-book being an executable or shell script the python call is useless
|
||||
# early exit on first match, avoid 2nd try with python call
|
||||
# in case of lilypond-book being an executable or shell script the python call is useless
|
||||
break
|
||||
else:
|
||||
logger.info('+ found LilyPond-book, but version %s is too old.' % version_number)
|
||||
|
Loading…
Reference in New Issue
Block a user