summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoshua Lock <josh@linux.intel.com>2012-03-26 13:13:18 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-03-28 16:49:17 +0100
commit58c19812050963cc221ec1133eae42cac7cb0433 (patch)
tree08f4cc763b647808637ffe12d31e0f0005e69490
parenteba155d4d5b845f74ef44ffa0dc200d1606faa3c (diff)
downloadpoky-58c19812050963cc221ec1133eae42cac7cb0433.tar.gz
lib/bb/ui/crumbs: tweak build status display
Use two lines to display the active task and recipe, per visual design. (From Poky rev: ea61503fc439e033b341bb7a50bac77c5e88834e) (Bitbake rev: ab508907308e8b1bc1b097df1f583dffd7ef25af) Signed-off-by: Joshua Lock <josh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-xbitbake/lib/bb/ui/crumbs/builddetailspage.py9
-rwxr-xr-xbitbake/lib/bb/ui/crumbs/builder.py3
2 files changed, 7 insertions, 5 deletions
diff --git a/bitbake/lib/bb/ui/crumbs/builddetailspage.py b/bitbake/lib/bb/ui/crumbs/builddetailspage.py
index c2f980fe77..df8304e06c 100755
--- a/bitbake/lib/bb/ui/crumbs/builddetailspage.py
+++ b/bitbake/lib/bb/ui/crumbs/builddetailspage.py
@@ -47,7 +47,7 @@ class BuildDetailsPage (HobPage):
47 self.vbox = gtk.VBox(False, 12) 47 self.vbox = gtk.VBox(False, 12)
48 48
49 self.progress_box = gtk.VBox(False, 12) 49 self.progress_box = gtk.VBox(False, 12)
50 self.task_status = gtk.Label() 50 self.task_status = gtk.Label("\n") # to ensure layout is correct
51 self.task_status.set_alignment(0.0, 0.5) 51 self.task_status.set_alignment(0.0, 0.5)
52 self.progress_box.pack_start(self.task_status, expand=False, fill=False) 52 self.progress_box.pack_start(self.task_status, expand=False, fill=False)
53 self.progress_hbox = gtk.HBox(False, 6) 53 self.progress_hbox = gtk.HBox(False, 6)
@@ -89,11 +89,14 @@ class BuildDetailsPage (HobPage):
89 self.back_button.connect("clicked", self.back_button_clicked_cb) 89 self.back_button.connect("clicked", self.back_button_clicked_cb)
90 self.button_box.pack_start(self.back_button, expand=False, fill=False) 90 self.button_box.pack_start(self.back_button, expand=False, fill=False)
91 91
92 def update_build_status(self, tsk_msg): 92 def update_build_status(self, current, total, task):
93 recipe_path, recipe_task = task.split(", ")
94 recipe = os.path.basename(recipe_path).rstrip(".bb")
95 tsk_msg = "<b>Running task %s of %s:</b> %s\n<b>Recipe:</b> %s" % (current, total, recipe_task, recipe)
93 self.task_status.set_markup(tsk_msg) 96 self.task_status.set_markup(tsk_msg)
94 97
95 def reset_build_status(self): 98 def reset_build_status(self):
96 self.task_status.set_markup("") 99 self.task_status.set_markup("\n") # to ensure layout is correct
97 100
98 def show_issues(self): 101 def show_issues(self):
99 self.num_of_issues += 1 102 self.num_of_issues += 1
diff --git a/bitbake/lib/bb/ui/crumbs/builder.py b/bitbake/lib/bb/ui/crumbs/builder.py
index f57a85501b..1d32a138e2 100755
--- a/bitbake/lib/bb/ui/crumbs/builder.py
+++ b/bitbake/lib/bb/ui/crumbs/builder.py
@@ -612,8 +612,7 @@ class Builder(gtk.Window):
612 elif message["eventname"] == "runQueueTaskStarted": 612 elif message["eventname"] == "runQueueTaskStarted":
613 fraction = 0.2 + 0.8 * fraction 613 fraction = 0.2 + 0.8 * fraction
614 self.build_details_page.update_progress_bar(title + ": ", fraction) 614 self.build_details_page.update_progress_bar(title + ": ", fraction)
615 self.build_details_page.update_build_status( 615 self.build_details_page.update_build_status(message["current"], message["total"], message["task"])
616 "<span weight=\'bold\'>Running task %s of %s:</span> %s" % (message["current"], message["total"], message["task"]))
617 616
618 def handler_build_failure_cb(self, running_build): 617 def handler_build_failure_cb(self, running_build):
619 self.build_details_page.show_issues() 618 self.build_details_page.show_issues()