From 2f3aaac785391d3574f54a2eb7ebe5befab2c2d1 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Fri, 18 Feb 2005 15:03:00 +0000
Subject: media_browser returns a filehandle when non save

---
 perl-install/diskdrake/interactive.pm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'perl-install/diskdrake/interactive.pm')

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('',
-- 
cgit v1.2.1