summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2004-08-11 09:22:30 +0000
committerRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2004-08-11 09:22:30 +0000
commit5363f9f6f7e1aa0946989ad4b564333a44bfcf70 (patch)
tree29fd8d86b7061377b7c4f0ff168c95e55a2b84b0
parent1d81ba3619f4faecca26508ecb452ad51990578f (diff)
downloaddrakx-5363f9f6f7e1aa0946989ad4b564333a44bfcf70.tar
drakx-5363f9f6f7e1aa0946989ad4b564333a44bfcf70.tar.gz
drakx-5363f9f6f7e1aa0946989ad4b564333a44bfcf70.tar.bz2
drakx-5363f9f6f7e1aa0946989ad4b564333a44bfcf70.tar.xz
drakx-5363f9f6f7e1aa0946989ad4b564333a44bfcf70.zip
Restore ability to have supplementary http media.
-rw-r--r--perl-install/install_any.pm9
1 files changed, 2 insertions, 7 deletions
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index 47f19e010..f13ade8bf 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -429,11 +429,6 @@ sub setPackages {
useMedium($prev_asked_medium);
last SUPPL;
}
- my $tmphdlistfile = pkgs::urpmidir($o->{prefix}) . "/hdlist$medium_name.cz";
- open(my $f2, ">", $tmphdlistfile);
- local $_;
- while (<$f>) { syswrite($f2, $_) }
- close $f; close $f2;
my $supplmedium = pkgs::psUsingHdlist(
$o->{prefix},
$suppl_method,
@@ -443,9 +438,9 @@ sub setPackages {
'', #- rpmsdir
"Supplementary media $medium_name", #- description
1, # selected
- $tmphdlistfile,
+ $f,
);
- unlink $tmphdlistfile;
+ close $f;
if ($supplmedium) {
log::l("read suppl hdlist (via $suppl_method)");
$supplmedium->{prefix} = $url; #- for install_urpmi