summaryrefslogtreecommitdiffstats
path: root/perl-install/install_steps.pm
diff options
context:
space:
mode:
authorGuillaume Cottenceau <gc@mandriva.com>2003-02-19 23:46:30 +0000
committerGuillaume Cottenceau <gc@mandriva.com>2003-02-19 23:46:30 +0000
commit7a21da20c34db394abcde18f08d106edc47ae8c2 (patch)
tree4c01519c1bf85cf0c02c810d7607ee7eb7e30138 /perl-install/install_steps.pm
parentcf502e8f3908835c936e78eda0cbe437a9bbb585 (diff)
downloaddrakx-7a21da20c34db394abcde18f08d106edc47ae8c2.tar
drakx-7a21da20c34db394abcde18f08d106edc47ae8c2.tar.gz
drakx-7a21da20c34db394abcde18f08d106edc47ae8c2.tar.bz2
drakx-7a21da20c34db394abcde18f08d106edc47ae8c2.tar.xz
drakx-7a21da20c34db394abcde18f08d106edc47ae8c2.zip
to workaround perl bug removing UTF8 flag when passing scalars to die's, pass
a scalar-ref. but we need to de-ref, so it might break many things :). let's make a prayer :).
Diffstat (limited to 'perl-install/install_steps.pm')
-rw-r--r--perl-install/install_steps.pm8
1 files changed, 4 insertions, 4 deletions
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index dce92be37..5b2db9845 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -184,7 +184,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}) {
@@ -219,7 +219,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
@@ -388,7 +388,7 @@ sub afterInstallPackages($) {
return if $::g_auto_install;
- 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");
@@ -565,7 +565,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();