diff options
-rwxr-xr-x | bitbake/lib/bb/ui/crumbs/builddetailspage.py | 9 | ||||
-rwxr-xr-x | bitbake/lib/bb/ui/crumbs/builder.py | 3 |
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() |