summaryrefslogtreecommitdiffstats
path: root/perl-install/standalone
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2002-01-22 20:31:52 +0000
committerPascal Rigaux <pixel@mandriva.com>2002-01-22 20:31:52 +0000
commitf85da3ea0e86a4a79dbb3a8fb4dd1c5d499deebe (patch)
tree97431ce90db1e1166cdc52b91e23b3266e7e3ff9 /perl-install/standalone
parent4430474523a0147b6448b9945ddd2e2cbc6c08d8 (diff)
downloaddrakx-f85da3ea0e86a4a79dbb3a8fb4dd1c5d499deebe.tar
drakx-f85da3ea0e86a4a79dbb3a8fb4dd1c5d499deebe.tar.gz
drakx-f85da3ea0e86a4a79dbb3a8fb4dd1c5d499deebe.tar.bz2
drakx-f85da3ea0e86a4a79dbb3a8fb4dd1c5d499deebe.tar.xz
drakx-f85da3ea0e86a4a79dbb3a8fb4dd1c5d499deebe.zip
cleanup error messages (and fix diskdrake's)
Diffstat (limited to 'perl-install/standalone')
-rwxr-xr-xperl-install/standalone/diskdrake10
1 files changed, 7 insertions, 3 deletions
diff --git a/perl-install/standalone/diskdrake b/perl-install/standalone/diskdrake
index d428e6955..414a261fa 100755
--- a/perl-install/standalone/diskdrake
+++ b/perl-install/standalone/diskdrake
@@ -66,11 +66,15 @@ if ($fileshare) {
my ($all_hds) =
catch_cdie { fsedit::hds([ detect_devices::hds() ], {}) }
sub {
- my ($err) = $@ =~ /(.*) at /;
- $@ =~ /overlapping/ and $in->ask_warn('', $@), return 1;
- $in->ask_okcancel(_("Error"),
+ my $err = formatError($@);
+ if ($err =~ /overlapping/) {
+ $in->ask_warn('', $err);
+ 1;
+ } else {
+ !$in->ask_okcancel(_("Error"),
[_("I can't read your partition table, it's too corrupted for me :(
I'll try to go on blanking bad partitions"), $err]);
+ }
};
$SIG{__DIE__} = sub { my $m = chomp_($_[0]); log::l("ERROR: $m") };