From 432f25c16c5067056b767f51243b9ddada214b2c Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Mon, 5 Apr 2004 09:24:25 +0000 Subject: perl now handle cleanly utf8 string in exceptions, no need to die \N("...") --- perl-install/install_interactive.pm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'perl-install/install_interactive.pm') diff --git a/perl-install/install_interactive.pm b/perl-install/install_interactive.pm index 8919649d2..69018db24 100644 --- a/perl-install/install_interactive.pm +++ b/perl-install/install_interactive.pm @@ -150,7 +150,7 @@ sub partitionWizardSolutions { }; $pkg->new($part->{device}, devices::make($part->{device})); }; - $@ and die \N("The FAT resizer is unable to handle your partition, + $@ and die N("The FAT resizer is unable to handle your partition, the following error occured: %s", formatError($@)); my $min_win = do { my $_w = $o->wait_message(N("Resizing"), N("Computing the size of the Windows partition")); @@ -160,7 +160,7 @@ the following error occured: %s", formatError($@)); #- this save at least a cylinder (less than 8Mb). $min_win += partition_table::raw::cylinder_size($hd); - $part->{size} > $min_linux + $min_swap + $min_freewin + $min_win or die \N("Your Windows partition is too fragmented. Please reboot your computer under Windows, run the ``defrag'' utility, then restart the Mandrakelinux installation."); + $part->{size} > $min_linux + $min_swap + $min_freewin + $min_win or die N("Your Windows partition is too fragmented. Please reboot your computer under Windows, run the ``defrag'' utility, then restart the Mandrakelinux installation."); $o->ask_okcancel('', formatAlaTeX(N("WARNING! DrakX will now resize your Windows partition. Be careful: this @@ -188,7 +188,7 @@ When sure, press Ok."))) or return; }; if (my $err = $@) { $part->{size} = $oldsize; - die \N("FAT resizing failed: %s", formatError($err)); + die N("FAT resizing failed: %s", formatError($err)); } $o->ask_warn('', N("To ensure data integrity after resizing the partition(s), -- cgit v1.2.1