diff options
| author | Rafael Garcia-Suarez <rgarciasuarez@mandriva.org> | 2005-02-04 16:05:31 +0000 |
|---|---|---|
| committer | Rafael Garcia-Suarez <rgarciasuarez@mandriva.org> | 2005-02-04 16:05:31 +0000 |
| commit | fa8c21b68060b62e5a063171648a8d97d6030fc7 (patch) | |
| tree | 412b2ebc415122258c60eedaf558fd3fde8776fa /perl-install/install_any.pm | |
| parent | da8526b2e44ec486a2a578e56961ecdd9af9b8df (diff) | |
| download | drakx-fa8c21b68060b62e5a063171648a8d97d6030fc7.tar drakx-fa8c21b68060b62e5a063171648a8d97d6030fc7.tar.gz drakx-fa8c21b68060b62e5a063171648a8d97d6030fc7.tar.bz2 drakx-fa8c21b68060b62e5a063171648a8d97d6030fc7.tar.xz drakx-fa8c21b68060b62e5a063171648a8d97d6030fc7.zip | |
call hdInstallPath only once
Diffstat (limited to 'perl-install/install_any.pm')
| -rw-r--r-- | perl-install/install_any.pm | 6 |
1 files changed, 4 insertions, 2 deletions
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} || |