The branch, 2.0.x, has been updated.
- Log -----------------------------------------------------------------
commit 50d0b13e08995a8275e99facbd16b9fdcfce934d
Author: Enrico Forestieri <for...@lyx.org>
Date: Tue Jan 1 20:15:57 2013 +0100
Fix bug #8477
Don't delay the output until the end of the check for the LaTeX packages.
diff --git a/lib/configure.py b/lib/configure.py
index f02a5ec..cad1502 100644
--- a/lib/configure.py
+++ b/lib/configure.py
@@ -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()
@@ -1197,14 +1202,15 @@ def checkLatexConfig(check_config, bool_docbook):
cl.close()
#
# we have chklayouts.tex, then process it
- ret = 1
- latex_out = cmdOutput(LATEX + ' wrap_chkconfig.ltx')
- for line in latex_out.splitlines():
+ 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:
diff --git a/status.20x b/status.20x
index c52a15f..d612849 100644
--- a/status.20x
+++ b/status.20x
@@ -105,6 +105,9 @@ What's new
- Fix a few selection bugs in tabular (bugs 4981, 7988).
+- Show the output of configure.py while the LaTeX packages are being checked
+ rather than all at once at the end of the check (bug 8477).
+
* DOCUMENTATION AND LOCALIZATION
-----------------------------------------------------------------------
Summary of changes:
lib/configure.py | 20 +++++++++++++-------
status.20x | 3 +++
2 files changed, 16 insertions(+), 7 deletions(-)
hooks/post-receive
--
The LyX Source Repository
