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/install2.pm | |
| parent | 3a986222e04aaa08efd903894aa2679b9ccb2b16 (diff) | |
| download | drakx-432f25c16c5067056b767f51243b9ddada214b2c.tar drakx-432f25c16c5067056b767f51243b9ddada214b2c.tar.gz drakx-432f25c16c5067056b767f51243b9ddada214b2c.tar.bz2 drakx-432f25c16c5067056b767f51243b9ddada214b2c.tar.xz drakx-432f25c16c5067056b767f51243b9ddada214b2c.zip | |
perl now handle cleanly utf8 string in exceptions, no need to die \N("...")
Diffstat (limited to 'perl-install/install2.pm')
| -rw-r--r-- | perl-install/install2.pm | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/perl-install/install2.pm b/perl-install/install2.pm index e15b03a08..e18a243d2 100644 --- a/perl-install/install2.pm +++ b/perl-install/install2.pm @@ -116,7 +116,7 @@ sub setupSCSI { if (!$o->{blank} && !$::testing && !$::uml_install) { -d '/lib/modules/' . c::kernel_version() || - -s modules::cz_file() or die \N("Can't access kernel modules corresponding to your kernel (file %s is missing), this generally means your boot floppy in not in sync with the Installation medium (please create a newer boot floppy)", modules::cz_file()); + -s modules::cz_file() or die N("Can't access kernel modules corresponding to your kernel (file %s is missing), this generally means your boot floppy in not in sync with the Installation medium (please create a newer boot floppy)", modules::cz_file()); } installStepsCall($o, $auto, 'setupSCSI', $clicked); @@ -166,7 +166,7 @@ sub formatPartitions { if ($want_root_formated) { foreach ('/usr') { my $part = fsedit::mntpoint2part($_, $o->{fstab}) or next; - $part->{toFormat} or die \N("You must also format %s", $_); + $part->{toFormat} or die N("You must also format %s", $_); } } installStepsCall($o, $auto, 'formatMountPartitions', $o->{fstab}) if !$::testing; @@ -628,7 +628,6 @@ sub main { $o->kill_action; $clicked = 0; if ($err) { - ref($err) eq 'SCALAR' and $err = $$err; local $_ = $err; $o->kill_action; if (!/^already displayed/) { |