From b19b34a08590f33973ffc9449accc21cdb1adbba Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Tue, 22 Aug 2000 13:14:24 +0000
Subject: no_comment

---
 perl-install/install_any.pm | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'perl-install/install_any.pm')

diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index 3c5c6801c..38ca70d54 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -113,7 +113,7 @@ sub errorOpeningFile($) {
 }
 sub getFile {
     my ($f, $method) = @_;
-    my $rel = install_any::relGetFile($f);
+    my $rel = relGetFile($f);
     log::l("getFile $f ($method) relGetFile $rel");
     do {
 	if ($method =~ /crypto/i) {
@@ -133,10 +133,9 @@ sub getFile {
 	    my $f2 = "$postinstall_rpms/$f";
 	    $f2 = "/tmp/rhimage/$rel" unless -e $f2;
 	    log::l("local getFile $f2");
-	    open GETFILE, $f2;
-	    *GETFILE;
+	    open GETFILE, $f2 and *GETFILE;
 	}
-    } or errorOpeningFile($f);
+    } || errorOpeningFile($f);
 }
 sub getAndSaveFile {
     my ($file, $local) = @_;
-- 
cgit v1.2.1