From b9493d8ad1604866c5e300ff73cc95f37172d6d8 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Thu, 20 Feb 2003 20:17:28 +0000
Subject: have ask_okcancel instead of ask_warn on cdie's

---
 perl-install/diskdrake/interactive.pm | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'perl-install')

diff --git a/perl-install/diskdrake/interactive.pm b/perl-install/diskdrake/interactive.pm
index 0f0a39fa7..60ce633ad 100644
--- a/perl-install/diskdrake/interactive.pm
+++ b/perl-install/diskdrake/interactive.pm
@@ -482,10 +482,11 @@ sub Create {
 
 	    check($in, $hd, $part, $all_hds) or return 1;
 	    $migrate_files = need_migration($in, $part->{mntpoint}) or return 1;
-
+	    
+	    my $seen;
 	    eval { 
 		catch_cdie { fsedit::add($hd, $part, $all_hds, { force => 1, primaryOrExtended => $primaryOrExtended }) }
-		  sub { $in->ask_warn('', formatError($@)); 1 };
+		  sub { $seen = 1; $in->ask_okcancel('', formatError($@)) };
 	    };
 	    if (my $err = $@) {
 		if ($err =~ /raw_add/ && $hd->hasExtended && !$hd->{primary}{extended}) {
@@ -494,7 +495,7 @@ sub Create {
 First remove a primary partition and create an extended partition."));
 		    return 0;
 		} else {
-		    $in->ask_warn(N("Error"), formatError($err));
+		    $in->ask_warn(N("Error"), formatError($err)) if !$seen;
 		    return 1;
 		}
 	    }
@@ -1016,12 +1017,13 @@ sub check_type {
 }
 sub check_mntpoint {
     my ($in, $mntpoint, $hd, $part, $all_hds) = @_;
+    my $seen;
     eval { 
 	catch_cdie { fsedit::check_mntpoint($mntpoint, $hd, $part, $all_hds) }
-	  sub { $in->ask_warn('', formatError($@)); 1 };
+	  sub { $seen = 1; $in->ask_okcancel('', formatError($@)) };
     };
     if (my $err = $@) {
-	$in->ask_warn('', formatError($err));
+	$in->ask_warn('', formatError($err)) if !$seen;
 	return;
     }
     1;
-- 
cgit v1.2.1