From a854068b525877583bbd9c6a32a8dffaf18cb2b5 Mon Sep 17 00:00:00 2001 From: Przemyslaw Gorszkowski Date: Mon, 26 Apr 2021 09:32:37 +0200 Subject: bitbake: progress: LineFilterProgressHandler - Handle parsing line which ends with CR only S3 commands need to handle different CR only line endings, update the handler to cope with this. (Bitbake rev: 3f7b9c1b429a4c68240e80832a8ef93ee210e5ff) Signed-off-by: Richard Purdie --- bitbake/lib/bb/progress.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'bitbake/lib') diff --git a/bitbake/lib/bb/progress.py b/bitbake/lib/bb/progress.py index d051ba0198..52d704d642 100644 --- a/bitbake/lib/bb/progress.py +++ b/bitbake/lib/bb/progress.py @@ -94,12 +94,15 @@ class LineFilterProgressHandler(ProgressHandler): while True: breakpos = self._linebuffer.find('\n') + 1 if breakpos == 0: - break + # for the case when the line with progress ends with only '\r' + breakpos = self._linebuffer.find('\r') + 1 + if breakpos == 0: + break line = self._linebuffer[:breakpos] self._linebuffer = self._linebuffer[breakpos:] # Drop any line feeds and anything that precedes them lbreakpos = line.rfind('\r') + 1 - if lbreakpos: + if lbreakpos and lbreakpos != breakpos: line = line[lbreakpos:] if self.writeline(filter_color(line)): super().write(line) -- cgit v1.2.3-54-g00ecf