diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2016-08-11 15:36:58 +1200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-08-17 10:22:58 +0100 |
commit | ea0800049d5a897ddf935ecdaa6e7d810166367b (patch) | |
tree | 6a1bdc7f2592183da2f307c7bf91fd91d3b8579f /bitbake/lib/bb/ui | |
parent | 1b6f701cd9e7f4ea6c2ee960d0749c5f6c8a683f (diff) | |
download | poky-ea0800049d5a897ddf935ecdaa6e7d810166367b.tar.gz |
bitbake: knotty: fix task progress bar not starting at 0%
If we have the task number here we need to subtract 1 to get the number
of tasks completed.
(Bitbake rev: 7c78a1cd3f0638ae76f7c7a469b7f667c7c58090)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/ui')
-rw-r--r-- | bitbake/lib/bb/ui/knotty.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/bitbake/lib/bb/ui/knotty.py b/bitbake/lib/bb/ui/knotty.py index 1723a72a8d..f89f7b3c30 100644 --- a/bitbake/lib/bb/ui/knotty.py +++ b/bitbake/lib/bb/ui/knotty.py | |||
@@ -260,13 +260,16 @@ class TerminalFilter(object): | |||
260 | content = "No currently running tasks (%s of %s)" % (self.helper.tasknumber_current, self.helper.tasknumber_total) | 260 | content = "No currently running tasks (%s of %s)" % (self.helper.tasknumber_current, self.helper.tasknumber_total) |
261 | else: | 261 | else: |
262 | content = "Currently %2s running tasks (%s of %s)" % (len(activetasks), self.helper.tasknumber_current, self.helper.tasknumber_total) | 262 | content = "Currently %2s running tasks (%s of %s)" % (len(activetasks), self.helper.tasknumber_current, self.helper.tasknumber_total) |
263 | maxtask = self.helper.tasknumber_total + 1 | 263 | maxtask = self.helper.tasknumber_total |
264 | if not self.main_progress or self.main_progress.maxval != maxtask: | 264 | if not self.main_progress or self.main_progress.maxval != maxtask: |
265 | widgets = [' ', progressbar.Percentage(), ' ', progressbar.Bar()] | 265 | widgets = [' ', progressbar.Percentage(), ' ', progressbar.Bar()] |
266 | self.main_progress = BBProgress("Running tasks", maxtask, widgets=widgets) | 266 | self.main_progress = BBProgress("Running tasks", maxtask, widgets=widgets) |
267 | self.main_progress.start(False) | 267 | self.main_progress.start(False) |
268 | self.main_progress.setmessage(content) | 268 | self.main_progress.setmessage(content) |
269 | self.main_progress.update(self.helper.tasknumber_current) | 269 | progress = self.helper.tasknumber_current - 1 |
270 | if progress < 0: | ||
271 | progress = 0 | ||
272 | self.main_progress.update(progress) | ||
270 | print('') | 273 | print('') |
271 | lines = 1 + int(len(content) / (self.columns + 1)) | 274 | lines = 1 + int(len(content) / (self.columns + 1)) |
272 | if not self.quiet: | 275 | if not self.quiet: |