summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2008-03-20 15:36:31 +0000
committerOlivier Blin <oblin@mandriva.com>2008-03-20 15:36:31 +0000
commit9bff16755070ddafdf3062563d76139bbdd594b3 (patch)
tree17deef2d8bb75cb84631c9dc734a80abaf96f8a6
parentfb10daeba26f0f91b3c086140069605728d4fb8c (diff)
downloaddrakx-9bff16755070ddafdf3062563d76139bbdd594b3.tar
drakx-9bff16755070ddafdf3062563d76139bbdd594b3.tar.gz
drakx-9bff16755070ddafdf3062563d76139bbdd594b3.tar.bz2
drakx-9bff16755070ddafdf3062563d76139bbdd594b3.tar.xz
drakx-9bff16755070ddafdf3062563d76139bbdd594b3.zip
- partitioning wizard: do not show error message in wizard mode when cancel is clicked (clean wizard window instead)
-rw-r--r--perl-install/NEWS3
-rw-r--r--perl-install/fs/partitioning_wizard.pm8
2 files changed, 10 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 3714992a9..68b55d84d 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,6 @@
+- partitioning wizard: do not show error message in wizard mode when
+ cancel is clicked (clean wizard window instead)
+
Version 10.17 - 20 March 2008
- use UUID by default (for diskdrake and draklive-install)
diff --git a/perl-install/fs/partitioning_wizard.pm b/perl-install/fs/partitioning_wizard.pm
index 0a00466d3..980e2efd5 100644
--- a/perl-install/fs/partitioning_wizard.pm
+++ b/perl-install/fs/partitioning_wizard.pm
@@ -279,7 +279,13 @@ sub main {
[ { val => \$sol, list => \@solutions, format => sub { $_[0][1] }, type => 'list' } ]);
log::l("partitionWizard calling solution $sol->[1]");
my $ok = eval { $sol->[2]->() };
- $@ and $o->ask_warn('', N("Partitioning failed: %s", formatError($@)));
+ if (my $err = $@) {
+ if ($err =~ /wizcancel/) {
+ $_->destroy foreach $::WizardTable->get_children;
+ } else {
+ $o->ask_warn('', N("Partitioning failed: %s", formatError($err)));
+ }
+ }
$ok or goto &main;
1;
}