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

Proper fix for #8477

Browse Source 
The "fix" in ec8ae50f was reintroducing #7718, #8098, and #8254.
This fix is hopefully right while still avoiding code duplication.
This commit is contained in:
Enrico Forestieri 2013-01-01 03:58:33 +01:00
parent 17b2adda4f
commit d46e595397
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/configure.py
View File

@ -56,9 +56,12 @@ def removeFiles(filenames):
pass
def cmdOutput(cmd):
def cmdOutput(cmd, async = False):
'''utility function: run a command and get its output as a string
cmd: command to run
async: if False, return whole output as a string, otherwise
return the stdout handle from which the output can be
read (the caller is then responsible for closing it)
'''
if os.name == 'nt':
b = False
@ -68,6 +71,8 @@ def cmdOutput(cmd):
pipe = subprocess.Popen(cmd, shell=b, close_fds=b, stdin=subprocess.PIPE, \
stdout=subprocess.PIPE, universal_newlines=True)
pipe.stdin.close()
if async:
return pipe.stdout
output = pipe.stdout.read()
pipe.stdout.close()
return output.strip()
@ -1173,17 +1178,15 @@ def checkLatexConfig(check_config, bool_docbook):
cl.close()
#
# we have chklayouts.tex, then process it
ret = 1
latex_out = os.popen(LATEX + ' wrap_chkconfig.ltx')
latex_out = cmdOutput(LATEX + ' wrap_chkconfig.ltx', True)
while True:
line = latex_out.readline()
if not line:
break;
if re.match('^\+', line):
logger.info(line.strip())
# return None if the command succeeds
if line == "+Inspection done.":
ret = None
# if the command succeeds, None will be returned
ret = latex_out.close()
#
# remove the copied file
if rmcopy: