summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2008-10-21 13:50:19 +0000
committerThierry Vignaud <tv@mandriva.org>2008-10-21 13:50:19 +0000
commit82b8f10585296bb6ebe3ce302cfb1521e45d1946 (patch)
tree125b7b52d28f996ed1550e7a77bf7edc5468102a
parentc150ee4670ed574e2de4ecc45eca1c08eccdb544 (diff)
downloadmgaonline-82b8f10585296bb6ebe3ce302cfb1521e45d1946.tar
mgaonline-82b8f10585296bb6ebe3ce302cfb1521e45d1946.tar.gz
mgaonline-82b8f10585296bb6ebe3ce302cfb1521e45d1946.tar.bz2
mgaonline-82b8f10585296bb6ebe3ce302cfb1521e45d1946.tar.xz
mgaonline-82b8f10585296bb6ebe3ce302cfb1521e45d1946.zip
(upgrade_failed) offer to retry the upgrade if it failed
-rw-r--r--NEWS1
-rwxr-xr-xmdkapplet-upgrade-helper19
2 files changed, 15 insertions, 5 deletions
diff --git a/NEWS b/NEWS
index 5b32a3be..37d18902 100644
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,7 @@
- mdkapplet-upgrade-helper
o disable custom downloader settings in order to default to aria2
o disable the X screen saver while upgrading the system
+ o offer to retry the upgrade if it failed
o when updates succeeded:
* offer to reboot
* s/should/must/
diff --git a/mdkapplet-upgrade-helper b/mdkapplet-upgrade-helper
index eda7c4ae..39c7dfa8 100755
--- a/mdkapplet-upgrade-helper
+++ b/mdkapplet-upgrade-helper
@@ -116,11 +116,20 @@ my @common = (
);
sub upgrade_failed() {
- ugtk2::ask_warn(N("Error"),
- N("Installation failed"),
- N("Installation logs can be found in '%s'", $log_file)
- );
- }
+ local $mygtk2::left_padding = 0;
+ my $w = ugtk2->new(N("Error"));
+ gtkadd($w->{window},
+ gtknew('VBox', children_tight => [
+ get_banner(),
+ gtknew('Label_Left', text => N("Installation failed"), @common),
+ gtknew('Label_Left', text => N("Installation logs can be found in '%s'", $log_file), @common),
+ create_okcancel($w, N("Retry"), N("Cancel")),
+ ]),
+ );
+ $w->{ok}->grab_focus;
+ my $answer = $w->main;
+ upgrade() if $answer;
+}
sub upgrade_distro_congratulations() {
local $mygtk2::left_padding = 0;