summaryrefslogtreecommitdiffstats
path: root/perl-install/partition_table.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/partition_table.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/partition_table.pm')
-rw-r--r--perl-install/partition_table.pm10
1 files changed, 5 insertions, 5 deletions
diff --git a/perl-install/partition_table.pm b/perl-install/partition_table.pm
index 19b7f2842..1bb76bf4c 100644
--- a/perl-install/partition_table.pm
+++ b/perl-install/partition_table.pm
@@ -678,7 +678,7 @@ sub add_primary {
}
sub add_extended {
- arch() =~ /^sparc|ppc/ and die N("Extended partition not supported on this platform");
+ arch() =~ /^sparc|ppc/ and die \N("Extended partition not supported on this platform");
my ($hd, $part, $extended_type) = @_;
$extended_type =~ s/Extended_?//;
@@ -778,16 +778,16 @@ sub load {
my ($hd, $file, $force) = @_;
local *F;
- open F, $file or die N("Error reading file %s", $file);
+ open F, $file or die \N("Error reading file %s", $file);
my $h;
{
local $/ = "\0";
eval <F>;
}
- $@ and die N("Restoring from file %s failed: %s", $file, $@);
+ $@ and die \N("Restoring from file %s failed: %s", $file, $@);
- ref($h) eq 'ARRAY' or die N("Bad backup file");
+ ref($h) eq 'ARRAY' or die \N("Bad backup file");
my %h; @h{@fields2save} = @$h;
@@ -807,5 +807,5 @@ sub save {
my @h = @{$hd}{@fields2save};
require Data::Dumper;
eval { output($file, Data::Dumper->Dump([\@h], ['$h']), "\0") }
- or die N("Error writing to file %s", $file);
+ or die \N("Error writing to file %s", $file);
}