diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2003-02-20 19:55:19 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2003-02-20 19:55:19 +0000 |
| commit | 9cd327666f087566dc256cc89cd77b5eaa35b73a (patch) | |
| tree | 4e11c4f970dab68eedff49e6938ba9b220657ccd /perl-install/diskdrake | |
| parent | 5e90be8c543f2ea5fa8d987245abf2337f634ea3 (diff) | |
| download | drakx-9cd327666f087566dc256cc89cd77b5eaa35b73a.tar drakx-9cd327666f087566dc256cc89cd77b5eaa35b73a.tar.gz drakx-9cd327666f087566dc256cc89cd77b5eaa35b73a.tar.bz2 drakx-9cd327666f087566dc256cc89cd77b5eaa35b73a.tar.xz drakx-9cd327666f087566dc256cc89cd77b5eaa35b73a.zip | |
add catch_cdie's around fsedit::check_mntpoint and fsedit::add
Diffstat (limited to 'perl-install/diskdrake')
| -rw-r--r-- | perl-install/diskdrake/interactive.pm | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/perl-install/diskdrake/interactive.pm b/perl-install/diskdrake/interactive.pm index ef10b3a6d..0f0a39fa7 100644 --- a/perl-install/diskdrake/interactive.pm +++ b/perl-install/diskdrake/interactive.pm @@ -483,7 +483,10 @@ sub Create { check($in, $hd, $part, $all_hds) or return 1; $migrate_files = need_migration($in, $part->{mntpoint}) or return 1; - eval { fsedit::add($hd, $part, $all_hds, { force => 1, primaryOrExtended => $primaryOrExtended }) }; + eval { + catch_cdie { fsedit::add($hd, $part, $all_hds, { force => 1, primaryOrExtended => $primaryOrExtended }) } + sub { $in->ask_warn('', formatError($@)); 1 }; + }; if (my $err = $@) { if ($err =~ /raw_add/ && $hd->hasExtended && !$hd->{primary}{extended}) { $in->ask_warn(N("Error"), N("You can't create a new partition @@ -1013,7 +1016,10 @@ sub check_type { } sub check_mntpoint { my ($in, $mntpoint, $hd, $part, $all_hds) = @_; - eval { fsedit::check_mntpoint($mntpoint, $hd, $part, $all_hds) }; + eval { + catch_cdie { fsedit::check_mntpoint($mntpoint, $hd, $part, $all_hds) } + sub { $in->ask_warn('', formatError($@)); 1 }; + }; if (my $err = $@) { $in->ask_warn('', formatError($err)); return; |