From f85da3ea0e86a4a79dbb3a8fb4dd1c5d499deebe Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Tue, 22 Jan 2002 20:31:52 +0000
Subject: cleanup error messages (and fix diskdrake's)

---
 perl-install/standalone/diskdrake | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'perl-install/standalone')

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