cooker: no cached in progressbar and add ETA

Rather than updating the progress bar based on the recipe being processed
(whether cached or parsed), consider only parsed recipes.  This reduces the
instability in progress rate introduced by the cached entries, and allows the
ETA to be resurrected and be a bit more useful.

(Bitbake rev: 618480f7739f6ae846f67a57bee5a78efb37839d)

Signed-off-by: Chris Larson <chris_larson@mentor.com>
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>

1 files changed, 2 insertions, 2 deletions

diff --git a/bitbake/lib/bb/ui/knotty.py b/bitbake/lib/bb/ui/knotty.py
index 8e5249bb62..0c0cdf1fe7 100644
--- a/bitbake/lib/bb/ui/knotty.py
+++ b/bitbake/lib/bb/ui/knotty.py
@@ -31,7 +31,7 @@ from bb.ui import uihelper
 
 logger = logging.getLogger("BitBake")
 widgets = ['Parsing recipes: ', progressbar.Percentage(), ' ',
-           progressbar.Bar()]
+           progressbar.Bar(), ' ', progressbar.ETA()]
 
 class BBLogFormatter(logging.Formatter):
     """Formatter which ensures that our 'plain' messages (logging.INFO + 1) are used as is"""
@@ -147,7 +147,7 @@ def init(server, eventHandler):
                 continue
             if isinstance(event, bb.event.ParseCompleted):
                 if interactive:
-                    pbar.update(event.total)
+                    pbar.update(pbar.maxval)
                 else:
                     sys.stdout.write("done.\n")
                     sys.stdout.flush()