leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

patman: Don't clear progress in tout unless it was used

Browse Source 
At present calling Uninit() always called ClearProgress() which outputs
a \r character as well as spaces to remove any progress information on the
line. This can mess up the normal output of binman and other tools. Fix
this by outputing this only when progress information has actually been
previous written.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2018-10-01 21:12:45 -06:00
parent 1fda18205f
commit 008b030009
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tools/patman/tout.py
View File

@ -15,6 +15,8 @@ NOTICE = 2
INFO = 3
DEBUG = 4
in_progress = False
"""
This class handles output of progress and other useful information
to the user. It provides for simple verbosity level control and can
@ -48,9 +50,11 @@ def UserIsPresent():
def ClearProgress():
"""Clear any active progress message on the terminal."""
if verbose > 0 and stdout_is_tty:
global in_progress
if verbose > 0 and stdout_is_tty and in_progress:
_stdout.write('\r%s\r' % (" " * len (_progress)))
_stdout.flush()
in_progress = False
def Progress(msg, warning=False, trailer='...'):
"""Display progress information.
@ -58,6 +62,7 @@ def Progress(msg, warning=False, trailer='...'):
Args:
msg: Message to display.
warning: True if this is a warning."""
global in_progress
ClearProgress()
if verbose > 0:
_progress = msg + trailer
@ -65,6 +70,7 @@ def Progress(msg, warning=False, trailer='...'):
col = _color.YELLOW if warning else _color.GREEN
_stdout.write('\r' + _color.Color(col, _progress))
_stdout.flush()
in_progress = True
else:
_stdout.write(_progress + '\n')