From 88f64118d7bece83c4fbc2219282b8b2fcc0c324 Mon Sep 17 00:00:00 2001
From: Rafael Garcia-Suarez <rgarciasuarez@mandriva.org>
Date: Fri, 25 Jun 2004 06:18:24 +0000
Subject: Make perl_checker silent

---
 perl-install/install_any.pm | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'perl-install')

diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index 8ce4ce1a3..bc15d0f90 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -40,9 +40,9 @@ my $cdrom;
 my %iso_images;
 
 sub mountCdrom {
-    my ($mountpoint, $cdrom_) = @_;
-    $cdrom_ = $cdrom if !defined $cdrom_;
-    eval { fs::mount($cdrom_, $mountpoint, "iso9660", 'readonly') };
+    my ($mountpoint, $o_cdrom) = @_;
+    $o_cdrom = $cdrom if !defined $o_cdrom;
+    eval { fs::mount($o_cdrom, $mountpoint, "iso9660", 'readonly') };
 }
 
 sub useMedium($) {
@@ -175,7 +175,7 @@ sub errorOpeningFile($) {
     return;
 }
 sub getFile {
-    my ($f, $o_method, $altroot) = @_;
+    my ($f, $o_method, $o_altroot) = @_;
     log::l("getFile $f:$o_method");
     my $rel = relGetFile($f);
     do {
@@ -196,8 +196,8 @@ sub getFile {
 	    #- this allows handling changing a media when some of the files on the
 	    #- first CD have been copied to other to avoid media change...
 	    my $f2 = "$postinstall_rpms/$f";
-	    $altroot ||= '/tmp/image';
-	    $f2 = "$altroot/$rel" if !$postinstall_rpms || !-e $f2;
+	    $o_altroot ||= '/tmp/image';
+	    $f2 = "$o_altroot/$rel" if !$postinstall_rpms || !-e $f2;
 	    $f2 = $rel if $rel =~ m!^/! && !-e $f2; #- not a relative path
 	    my $F; open($F, $f2) && $F;
 	}
-- 
cgit v1.2.1