diff options
| author | Guillaume Cottenceau <gc@mandriva.com> | 2003-02-19 23:46:30 +0000 |
|---|---|---|
| committer | Guillaume Cottenceau <gc@mandriva.com> | 2003-02-19 23:46:30 +0000 |
| commit | 7a21da20c34db394abcde18f08d106edc47ae8c2 (patch) | |
| tree | 4c01519c1bf85cf0c02c810d7607ee7eb7e30138 /perl-install/install_any.pm | |
| parent | cf502e8f3908835c936e78eda0cbe437a9bbb585 (diff) | |
| download | drakx-backup-do-not-use-7a21da20c34db394abcde18f08d106edc47ae8c2.tar drakx-backup-do-not-use-7a21da20c34db394abcde18f08d106edc47ae8c2.tar.gz drakx-backup-do-not-use-7a21da20c34db394abcde18f08d106edc47ae8c2.tar.bz2 drakx-backup-do-not-use-7a21da20c34db394abcde18f08d106edc47ae8c2.tar.xz drakx-backup-do-not-use-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_any.pm')
| -rw-r--r-- | perl-install/install_any.pm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm index a7d2a89a8..2b840b6d0 100644 --- a/perl-install/install_any.pm +++ b/perl-install/install_any.pm @@ -465,7 +465,7 @@ sub setAuthentication { #run_program::rooted($o->{prefix}, "/usr/sbin/chkauth", "yp", $domain, "-s", $nis); $o->pkg_install("ypbind"); my $domain = $o->{netc}{NISDOMAIN}; - $domain || $nis ne "broadcast" or die N("Can't use broadcast with no NIS domain"); + $domain || $nis ne "broadcast" or die \N("Can't use broadcast with no NIS domain"); my $t = $domain ? "domain $domain" . ($nis ne "broadcast" && " server") : "ypserver"; substInFile { $_ = "#~$_" unless /^#/; @@ -878,7 +878,7 @@ sub loadO { -e "$f.pl" and $f .= ".pl" unless -e $f; my $fh; - if (-e $f) { open $fh, $f } else { $fh = getFile($f) or die N("Error reading file %s", $f) } + if (-e $f) { open $fh, $f } else { $fh = getFile($f) or die \N("Error reading file %s", $f) } { local $/ = "\0"; no strict; @@ -996,7 +996,7 @@ sub getHds { my $hds = $all_hds->{hds}; if (is_empty_array_ref($hds)) { #- no way - die N("An error occurred - no valid devices were found on which to create new filesystems. Please check your hardware for the cause of this problem"); + die \N("An error occurred - no valid devices were found on which to create new filesystems. Please check your hardware for the cause of this problem"); } #- try to figure out if the same number of hds is available, use them if ok. |