bitbake: knotty: fix some minor bugs in BBProgress
If you specify custom widgets then we don't want to assume where the "extra" position is - you should have to specify it, and if it isn't specified it shouldn't just wipe out the last widget or you can start to see odd behaviour if you're modifying the code. (Bitbake rev: 19e33c10feb1637589ceb05b5e8d58b1e012ccb8) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
0c3ce68410
commit
23a551bea1
|
@ -40,9 +40,9 @@ logger = logging.getLogger("BitBake")
|
|||
interactive = sys.stdout.isatty()
|
||||
|
||||
class BBProgress(progressbar.ProgressBar):
|
||||
def __init__(self, msg, maxval, widgets=None):
|
||||
def __init__(self, msg, maxval, widgets=None, extrapos=-1):
|
||||
self.msg = msg
|
||||
self.extrapos = -1
|
||||
self.extrapos = extrapos
|
||||
if not widgets:
|
||||
widgets = [progressbar.Percentage(), ' ', progressbar.Bar(), ' ',
|
||||
progressbar.ETA()]
|
||||
|
@ -69,6 +69,7 @@ class BBProgress(progressbar.ProgressBar):
|
|||
self.widgets[0] = msg
|
||||
|
||||
def setextra(self, extra):
|
||||
if self.extrapos > -1:
|
||||
if extra:
|
||||
extrastr = str(extra)
|
||||
if extrastr[0] != ' ':
|
||||
|
@ -241,7 +242,7 @@ class TerminalFilter(object):
|
|||
start_time = activetasks[t].get("starttime", None)
|
||||
if not pbar or pbar.bouncing != (progress < 0):
|
||||
if progress < 0:
|
||||
pbar = BBProgress("0: %s (pid %s) " % (activetasks[t]["title"], t), 100, widgets=[progressbar.BouncingSlider()])
|
||||
pbar = BBProgress("0: %s (pid %s) " % (activetasks[t]["title"], t), 100, widgets=[progressbar.BouncingSlider(), ''], extrapos=2)
|
||||
pbar.bouncing = True
|
||||
else:
|
||||
pbar = BBProgress("0: %s (pid %s) " % (activetasks[t]["title"], t), 100)
|
||||
|
|
Loading…
Reference in New Issue