summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2003-08-21 14:33:53 +0000
committerPascal Rigaux <pixel@mandriva.com>2003-08-21 14:33:53 +0000
commitc73a636af3478eb0c78c3768d381b42bac173569 (patch)
tree7ec6b19efa2bb52a0149e22cb1356db36fe36de8
parentb3c2d8a8073aa68a7cc16a919c522c69067f4351 (diff)
downloaddrakx-c73a636af3478eb0c78c3768d381b42bac173569.tar
drakx-c73a636af3478eb0c78c3768d381b42bac173569.tar.gz
drakx-c73a636af3478eb0c78c3768d381b42bac173569.tar.bz2
drakx-c73a636af3478eb0c78c3768d381b42bac173569.tar.xz
drakx-c73a636af3478eb0c78c3768d381b42bac173569.zip
- fix call to openit()
- replace *F with $F
-rw-r--r--perl-install/partition_table.pm10
1 files changed, 4 insertions, 6 deletions
diff --git a/perl-install/partition_table.pm b/perl-install/partition_table.pm
index 4df9903eb..9e6118385 100644
--- a/perl-install/partition_table.pm
+++ b/perl-install/partition_table.pm
@@ -606,11 +606,10 @@ sub write {
if ($hd->{needKernelReread} && ref($hd->{needKernelReread}) eq 'ARRAY' && $::isStandalone) {
#- we've only been adding partitions. Try special add_partition (using BLKPG_ADD_PARTITION)
- local *F;
- partition_table::raw::openit($hd, *F) or goto force_reread;
+ my $F = partition_table::raw::openit($hd) or goto force_reread;
foreach (@{$hd->{needKernelReread}}) {
- c::add_partition(fileno F, $_->{start}, $_->{size}, $_->{device} =~ /(\d+)$/)
+ c::add_partition(fileno $F, $_->{start}, $_->{size}, $_->{device} =~ /(\d+)$/)
or goto force_reread;
}
} elsif ($hd->{needKernelReread}) {
@@ -787,13 +786,12 @@ sub next_start {
sub load {
my ($hd, $file, $b_force) = @_;
- local *F;
- open F, $file or die \N("Error reading file %s", $file);
+ open(my $F, $file) or die \N("Error reading file %s", $file);
my $h;
{
local $/ = "\0";
- eval <F>;
+ eval <$F>;
}
$@ and die \N("Restoring from file %s failed: %s", $file, $@);