diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2005-02-18 15:03:00 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2005-02-18 15:03:00 +0000 |
| commit | 2f3aaac785391d3574f54a2eb7ebe5befab2c2d1 (patch) | |
| tree | aa3f657dba5a101375f7c8fd2f46ff2c01c9ec85 /perl-install/diskdrake | |
| parent | 5a222ad82ffcf5548f86c5efab8ffb90a8b7efb3 (diff) | |
| download | drakx-2f3aaac785391d3574f54a2eb7ebe5befab2c2d1.tar drakx-2f3aaac785391d3574f54a2eb7ebe5befab2c2d1.tar.gz drakx-2f3aaac785391d3574f54a2eb7ebe5befab2c2d1.tar.bz2 drakx-2f3aaac785391d3574f54a2eb7ebe5befab2c2d1.tar.xz drakx-2f3aaac785391d3574f54a2eb7ebe5befab2c2d1.zip | |
media_browser returns a filehandle when non save
Diffstat (limited to 'perl-install/diskdrake')
| -rw-r--r-- | perl-install/diskdrake/interactive.pm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/perl-install/diskdrake/interactive.pm b/perl-install/diskdrake/interactive.pm index a0cdb98a1..ad252332f 100644 --- a/perl-install/diskdrake/interactive.pm +++ b/perl-install/diskdrake/interactive.pm @@ -371,17 +371,17 @@ sub More { sub ReadFromFile { my ($in, $hd) = @_; - my ($h, $file) = ('', ''); + my ($h, $file, $fh); if ($::isStandalone) { $file = $in->ask_file(N("Select file")) or return; } else { undef $h; #- help perl_checker my $name = $hd->{device}; $name =~ s!/!_!g; - ($h, $file) = install_any::media_browser($in, '', "part_$name") or return; + ($h, $fh) = install_any::media_browser($in, '', "part_$name") or return; } eval { - catch_cdie { partition_table::load($hd, $file) } + catch_cdie { partition_table::load($hd, $file || $fh) } sub { $@ =~ /bad totalsectors/ or return; $in->ask_yesorno('', |