summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2005-03-04 13:49:15 +0000
committerRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2005-03-04 13:49:15 +0000
commitf1439499d02d3fafc355a67de4536bce25243183 (patch)
tree65766d7a5b6c3a448ed8d4bf45d70a17d394ec8e
parente9863c2b61f61bddaae314a71f38918eb639f6ce (diff)
downloaddrakx-f1439499d02d3fafc355a67de4536bce25243183.tar
drakx-f1439499d02d3fafc355a67de4536bce25243183.tar.gz
drakx-f1439499d02d3fafc355a67de4536bce25243183.tar.bz2
drakx-f1439499d02d3fafc355a67de4536bce25243183.tar.xz
drakx-f1439499d02d3fafc355a67de4536bce25243183.zip
Fix passing installation method instead of description to install_any::getFile
-rw-r--r--perl-install/pkgs.pm6
1 files changed, 3 insertions, 3 deletions
diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm
index f87b3b4e2..c30bd0852 100644
--- a/perl-install/pkgs.pm
+++ b/perl-install/pkgs.pm
@@ -1020,7 +1020,7 @@ sub installTransactionClosure {
my $pkg = $packages->{depslist}[$l[0]];
#- force changeCD callback to be called from main process.
- install_any::getFile($pkg->filename, $medium->{descr}, $suppl_CD ? supplCDMountPoint() : undef);
+ install_any::getFile($pkg->filename, $::o->{method}, $suppl_CD ? supplCDMountPoint() : undef);
#- close opened handle above.
install_any::getFile('XXX');
}
@@ -1177,9 +1177,9 @@ sub install {
my $f = $pkg && $pkg->filename;
print $LOG "$f\n";
if (isSupplCDMedium($medium)) {
- $fd = install_any::getFile($f, $medium->{descr}, supplCDMountPoint());
+ $fd = install_any::getFile($f, $::o->{method}, supplCDMountPoint());
} else {
- $fd = install_any::getFile($f, $medium->{descr}, $medium->{prefix});
+ $fd = install_any::getFile($f, $::o->{method}, $medium->{prefix});
}
$fd ? fileno $fd : -1;
}, callback_close => sub {