From fa8c21b68060b62e5a063171648a8d97d6030fc7 Mon Sep 17 00:00:00 2001
From: Rafael Garcia-Suarez <rgarciasuarez@mandriva.org>
Date: Fri, 4 Feb 2005 16:05:31 +0000
Subject: call hdInstallPath only once

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

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

diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index d11cbb8a1..e1efb640c 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -847,8 +847,10 @@ sub warnAboutFilesStillOpen() {
 sub install_urpmi {
     my ($method, $packages, $mediums) = @_;
 
+    my $hdInstallPath = any::hdInstallPath();
+
     #- rare case where urpmi cannot be installed (no hd install path).
-    $method eq 'disk' && !any::hdInstallPath() and return;
+    $method eq 'disk' && !$hdInstallPath and return;
 
     log::l("install_urpmi $method");
     #- clean to avoid opening twice the rpm db.
@@ -873,7 +875,7 @@ sub install_urpmi {
 	if ($_->{ignored} || $_->{selected}) {
 	    my $curmethod = $_->{method} || $::o->{method};
 	    my $dir = ($_->{prefix} || ${{ nfs => "file://mnt/nfs", 
-					   disk => "file:/" . any::hdInstallPath(),
+					   disk => "file:/" . $hdInstallPath,
 					   ftp => $ENV{URLPREFIX},
 					   http => $ENV{URLPREFIX},
 					   cdrom => "removable://mnt/cdrom" }}{$curmethod} ||
-- 
cgit v1.2.1