summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2003-02-20 20:17:28 +0000
committerPascal Rigaux <pixel@mandriva.com>2003-02-20 20:17:28 +0000
commitb9493d8ad1604866c5e300ff73cc95f37172d6d8 (patch)
tree8b3aacc4fa5c79d71dc1c889160498e4a667e8bd
parent3d398ea7989c9387bc6c100d314088a58c88ea23 (diff)
downloaddrakx-b9493d8ad1604866c5e300ff73cc95f37172d6d8.tar
drakx-b9493d8ad1604866c5e300ff73cc95f37172d6d8.tar.gz
drakx-b9493d8ad1604866c5e300ff73cc95f37172d6d8.tar.bz2
drakx-b9493d8ad1604866c5e300ff73cc95f37172d6d8.tar.xz
drakx-b9493d8ad1604866c5e300ff73cc95f37172d6d8.zip
have ask_okcancel instead of ask_warn on cdie's
-rw-r--r--perl-install/diskdrake/interactive.pm12
1 files changed, 7 insertions, 5 deletions
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;