diff options
Diffstat (limited to 'bitbake')
-rw-r--r-- | bitbake/lib/bb/ui/knotty.py | 6 | ||||
-rw-r--r-- | bitbake/lib/bb/ui/uihelper.py | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/bitbake/lib/bb/ui/knotty.py b/bitbake/lib/bb/ui/knotty.py index 8df745d130..484545a684 100644 --- a/bitbake/lib/bb/ui/knotty.py +++ b/bitbake/lib/bb/ui/knotty.py | |||
@@ -276,11 +276,11 @@ class TerminalFilter(object): | |||
276 | print(content) | 276 | print(content) |
277 | else: | 277 | else: |
278 | if self.quiet: | 278 | if self.quiet: |
279 | content = "Running tasks (%s of %s)" % (self.helper.tasknumber_current, self.helper.tasknumber_total) | 279 | content = "Running tasks (%s of %s/%s of %s)" % (self.helper.setscene_current, self.helper.setscene_total, self.helper.tasknumber_current, self.helper.tasknumber_total) |
280 | elif not len(activetasks): | 280 | elif not len(activetasks): |
281 | content = "No currently running tasks (%s of %s)" % (self.helper.tasknumber_current, self.helper.tasknumber_total) | 281 | content = "No currently running tasks (%s of %s/%s of %s)" % (self.helper.setscene_current, self.helper.setscene_total, self.helper.tasknumber_current, self.helper.tasknumber_total) |
282 | else: | 282 | else: |
283 | content = "Currently %2s running tasks (%s of %s)" % (len(activetasks), self.helper.tasknumber_current, self.helper.tasknumber_total) | 283 | content = "Currently %2s running tasks (%s of %s/%s of %s)" % (len(activetasks), self.helper.setscene_current, self.helper.setscene_total, self.helper.tasknumber_current, self.helper.tasknumber_total) |
284 | maxtask = self.helper.tasknumber_total | 284 | maxtask = self.helper.tasknumber_total |
285 | if not self.main_progress or self.main_progress.maxval != maxtask: | 285 | if not self.main_progress or self.main_progress.maxval != maxtask: |
286 | widgets = [' ', progressbar.Percentage(), ' ', progressbar.Bar()] | 286 | widgets = [' ', progressbar.Percentage(), ' ', progressbar.Bar()] |
diff --git a/bitbake/lib/bb/ui/uihelper.py b/bitbake/lib/bb/ui/uihelper.py index 52fdae3fec..82913e0da8 100644 --- a/bitbake/lib/bb/ui/uihelper.py +++ b/bitbake/lib/bb/ui/uihelper.py | |||
@@ -50,8 +50,10 @@ class BBUIHelper: | |||
50 | removetid(event.pid, tid) | 50 | removetid(event.pid, tid) |
51 | self.failed_tasks.append( { 'title' : "%s %s" % (event._package, event._task)}) | 51 | self.failed_tasks.append( { 'title' : "%s %s" % (event._package, event._task)}) |
52 | elif isinstance(event, bb.runqueue.runQueueTaskStarted) or isinstance(event, bb.runqueue.sceneQueueTaskStarted): | 52 | elif isinstance(event, bb.runqueue.runQueueTaskStarted) or isinstance(event, bb.runqueue.sceneQueueTaskStarted): |
53 | self.tasknumber_current = event.stats.completed + event.stats.active + event.stats.failed + event.stats.setscene_active + 1 | 53 | self.tasknumber_current = event.stats.completed + event.stats.active + event.stats.failed |
54 | self.tasknumber_total = event.stats.total | 54 | self.tasknumber_total = event.stats.total |
55 | self.setscene_current = event.stats.setscene_active + event.stats.setscene_covered + event.stats.setscene_notcovered | ||
56 | self.setscene_total = event.stats.setscene_total | ||
55 | self.needUpdate = True | 57 | self.needUpdate = True |
56 | elif isinstance(event, bb.build.TaskProgress): | 58 | elif isinstance(event, bb.build.TaskProgress): |
57 | if event.pid > 0 and event.pid in self.pidmap: | 59 | if event.pid > 0 and event.pid in self.pidmap: |