diff options
Diffstat (limited to 'bitbake/lib/bb/ui/crumbs/builder.py')
-rwxr-xr-x | bitbake/lib/bb/ui/crumbs/builder.py | 28 |
1 files changed, 20 insertions, 8 deletions
diff --git a/bitbake/lib/bb/ui/crumbs/builder.py b/bitbake/lib/bb/ui/crumbs/builder.py index 6df1ca41bd..73d31f8e6f 100755 --- a/bitbake/lib/bb/ui/crumbs/builder.py +++ b/bitbake/lib/bb/ui/crumbs/builder.py | |||
@@ -927,6 +927,18 @@ class Builder(gtk.Window): | |||
927 | status = "stop" | 927 | status = "stop" |
928 | message = "Build stopped: " | 928 | message = "Build stopped: " |
929 | fraction = self.build_details_page.progress_bar.get_fraction() | 929 | fraction = self.build_details_page.progress_bar.get_fraction() |
930 | stop_to_next_edit = "" | ||
931 | if self.current_step == self.FAST_IMAGE_GENERATING: | ||
932 | stop_to_next_edit = "image configuration" | ||
933 | elif self.current_step == self.IMAGE_GENERATING: | ||
934 | if self.previous_step == self.FAST_IMAGE_GENERATING: | ||
935 | stop_to_next_edit = "image configuration" | ||
936 | else: | ||
937 | stop_to_next_edit = "packages" | ||
938 | elif self.current_step == self.PACKAGE_GENERATING: | ||
939 | stop_to_next_edit = "recipes" | ||
940 | button = self.build_details_page.show_stop_page(stop_to_next_edit.split(' ')[0]) | ||
941 | self.set_default(button) | ||
930 | else: | 942 | else: |
931 | fail_to_next_edit = "" | 943 | fail_to_next_edit = "" |
932 | if self.current_step == self.FAST_IMAGE_GENERATING: | 944 | if self.current_step == self.FAST_IMAGE_GENERATING: |
@@ -941,7 +953,7 @@ class Builder(gtk.Window): | |||
941 | elif self.current_step == self.PACKAGE_GENERATING: | 953 | elif self.current_step == self.PACKAGE_GENERATING: |
942 | fail_to_next_edit = "recipes" | 954 | fail_to_next_edit = "recipes" |
943 | fraction = 1.0 | 955 | fraction = 1.0 |
944 | self.build_details_page.show_fail_page(fail_to_next_edit.split(' ')[0], fail_to_next_edit) | 956 | self.build_details_page.show_fail_page(fail_to_next_edit.split(' ')[0]) |
945 | status = "fail" | 957 | status = "fail" |
946 | message = "Build failed: " | 958 | message = "Build failed: " |
947 | self.build_details_page.update_progress_bar(message, fraction, status) | 959 | self.build_details_page.update_progress_bar(message, fraction, status) |
@@ -1349,19 +1361,19 @@ class Builder(gtk.Window): | |||
1349 | HobButton.style_button(button) | 1361 | HobButton.style_button(button) |
1350 | else: | 1362 | else: |
1351 | lbl = "<b>Stop build?</b>\n\nAre you sure you want to stop this" | 1363 | lbl = "<b>Stop build?</b>\n\nAre you sure you want to stop this" |
1352 | lbl = lbl + " build?\n\n'Force Stop' will stop the build as quickly as" | 1364 | lbl = lbl + " build?\n\n'Stop' will stop the build as soon as all in" |
1353 | lbl = lbl + " possible but may well leave your build directory in an" | ||
1354 | lbl = lbl + " unusable state that requires manual steps to fix.\n\n" | ||
1355 | lbl = lbl + "'Stop' will stop the build as soon as all in" | ||
1356 | lbl = lbl + " progress build tasks are finished. However if a" | 1365 | lbl = lbl + " progress build tasks are finished. However if a" |
1357 | lbl = lbl + " lengthy compilation phase is in progress this may take" | 1366 | lbl = lbl + " lengthy compilation phase is in progress this may take" |
1358 | lbl = lbl + " some time." | 1367 | lbl = lbl + " some time.\n\n" |
1368 | lbl = lbl + "'Force Stop' will stop the build as quickly as" | ||
1369 | lbl = lbl + " possible but may well leave your build directory in an" | ||
1370 | lbl = lbl + " unusable state that requires manual steps to fix." | ||
1359 | dialog = CrumbsMessageDialog(self, lbl, gtk.STOCK_DIALOG_WARNING) | 1371 | dialog = CrumbsMessageDialog(self, lbl, gtk.STOCK_DIALOG_WARNING) |
1360 | button = dialog.add_button("Cancel", gtk.RESPONSE_CANCEL) | 1372 | button = dialog.add_button("Cancel", gtk.RESPONSE_CANCEL) |
1361 | HobAltButton.style_button(button) | 1373 | HobAltButton.style_button(button) |
1362 | button = dialog.add_button("Stop", gtk.RESPONSE_OK) | 1374 | button = dialog.add_button("Force stop", gtk.RESPONSE_YES) |
1363 | HobAltButton.style_button(button) | 1375 | HobAltButton.style_button(button) |
1364 | button = dialog.add_button("Force Stop", gtk.RESPONSE_YES) | 1376 | button = dialog.add_button("Stop", gtk.RESPONSE_OK) |
1365 | HobButton.style_button(button) | 1377 | HobButton.style_button(button) |
1366 | response = dialog.run() | 1378 | response = dialog.run() |
1367 | dialog.destroy() | 1379 | dialog.destroy() |