From 9bff16755070ddafdf3062563d76139bbdd594b3 Mon Sep 17 00:00:00 2001
From: Olivier Blin <oblin@mandriva.com>
Date: Thu, 20 Mar 2008 15:36:31 +0000
Subject: - partitioning wizard: do not show error message in wizard mode when
 cancel is clicked (clean wizard window instead)

---
 perl-install/fs/partitioning_wizard.pm | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'perl-install/fs/partitioning_wizard.pm')

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;
 }
-- 
cgit v1.2.1