diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2004-04-05 09:24:25 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2004-04-05 09:24:25 +0000 |
| commit | 432f25c16c5067056b767f51243b9ddada214b2c (patch) | |
| tree | 000224647e4d436406344f0e02bc8757e138b4c5 /perl-install/install_steps.pm | |
| parent | 3a986222e04aaa08efd903894aa2679b9ccb2b16 (diff) | |
| download | drakx-backup-do-not-use-432f25c16c5067056b767f51243b9ddada214b2c.tar drakx-backup-do-not-use-432f25c16c5067056b767f51243b9ddada214b2c.tar.gz drakx-backup-do-not-use-432f25c16c5067056b767f51243b9ddada214b2c.tar.bz2 drakx-backup-do-not-use-432f25c16c5067056b767f51243b9ddada214b2c.tar.xz drakx-backup-do-not-use-432f25c16c5067056b767f51243b9ddada214b2c.zip | |
perl now handle cleanly utf8 string in exceptions, no need to die \N("...")
Diffstat (limited to 'perl-install/install_steps.pm')
| -rw-r--r-- | perl-install/install_steps.pm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm index 26ea83d9a..23df4874b 100644 --- a/perl-install/install_steps.pm +++ b/perl-install/install_steps.pm @@ -203,7 +203,7 @@ sub doPartitionDisksAfter { } if (arch() =~ /ia64/ && !fsedit::has_mntpoint("/boot/efi", $o->{all_hds})) { - die \N("You must have a FAT partition mounted in /boot/efi"); + die N("You must have a FAT partition mounted in /boot/efi"); } if ($o->{partitioning}{use_existing_root} && !$::recovery) { @@ -238,7 +238,7 @@ sub ask_mntpoint_s {#-}}} next if !$m || $m eq 'swap'; #- there may be a lot of swap. - $m{$m} and die \N("Duplicate mount point %s", $m); + $m{$m} and die N("Duplicate mount point %s", $m); $m{$m} = 1; #- in case the type does not correspond, force it to ext3 @@ -403,7 +403,7 @@ sub installPackages($$) { #- complete REWORK, TODO and TOCHECK! sub afterInstallPackages($) { my ($o) = @_; - die \N("Some important packages didn't get installed properly. + die N("Some important packages didn't get installed properly. Either your cdrom drive or your cdrom is defective. Check the cdrom on an installed computer using \"rpm -qpl Mandrake/RPMS/*.rpm\" ") if any { m|read failed: Input/output error| } cat_("$o->{prefix}/root/drakx/install.log"); @@ -532,7 +532,7 @@ GridHeight=70 my @l = detect_devices::floppies_dev(); foreach (qw(blank updatemodules)) { - $o->{$_} eq "1" and $o->{$_} = $l[0] || die \N("No floppy drive available"); + $o->{$_} eq "1" and $o->{$_} = $l[0] || die N("No floppy drive available"); } $o->{blank} and $o->copyKernelFromFloppy; |