summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2004-08-10 05:09:27 +0000
committerRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2004-08-10 05:09:27 +0000
commit0e00d8fa29ab405b0339095fb3df3bf526ffb106 (patch)
treee8b10467c8adbb223c41f8f3afe4d6c6f6ad6c68
parentac8319729327f501e39b40af655672e7d4e04b7e (diff)
downloaddrakx-0e00d8fa29ab405b0339095fb3df3bf526ffb106.tar
drakx-0e00d8fa29ab405b0339095fb3df3bf526ffb106.tar.gz
drakx-0e00d8fa29ab405b0339095fb3df3bf526ffb106.tar.bz2
drakx-0e00d8fa29ab405b0339095fb3df3bf526ffb106.tar.xz
drakx-0e00d8fa29ab405b0339095fb3df3bf526ffb106.zip
install_urpmi(): set up the right with_hdlist for urpmi.cfg
-rw-r--r--perl-install/install_any.pm5
1 files changed, 4 insertions, 1 deletions
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index 2ad6013c0..c472aa152 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -452,6 +452,7 @@ sub setPackages {
$supplmedium->{prefix} = $url; #- for install_urpmi
$supplmedium->{selected} = 1;
$supplmedium->{method} = $suppl_method;
+ $supplmedium->{with_hdlist} = 'media_info/hdlist.cz'; #- for install_urpmi
} else {
log::l("no suppl hdlist");
}
@@ -775,11 +776,13 @@ sub install_urpmi {
$qname =~ s/(\s)/\\$1/g; $qdir =~ s/(\s)/\\$1/g;
#- compute correctly reference to media/media_info
- #- FIXME
my $with;
if ($_->{update}) {
#- an update medium always use "../base/hdlist.cz";
+ #- FIXME
$with = "../base/hdlist.cz";
+ } elsif ($_->{with_hdlist}) {
+ $with = $_->{with_hdlist};
} else {
$with = $_->{rpmsdir};
$with =~ s|/[^/]*%{ARCH}.*||;