summaryrefslogtreecommitdiffstats
path: root/perl-install/pkgs.pm
diff options
context:
space:
mode:
authorRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2004-10-19 12:39:04 +0000
committerRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2004-10-19 12:39:04 +0000
commit5a09350052ada4a3cf121c6f942170bb8f0922a7 (patch)
tree6aa5f1d76999cb94434910fd816052482531807d /perl-install/pkgs.pm
parent45d0fd32182ee9eac02c4fe2b763aeb8326a53e7 (diff)
downloaddrakx-5a09350052ada4a3cf121c6f942170bb8f0922a7.tar
drakx-5a09350052ada4a3cf121c6f942170bb8f0922a7.tar.gz
drakx-5a09350052ada4a3cf121c6f942170bb8f0922a7.tar.bz2
drakx-5a09350052ada4a3cf121c6f942170bb8f0922a7.tar.xz
drakx-5a09350052ada4a3cf121c6f942170bb8f0922a7.zip
Installation with a ftp supplementary media (for mini-isos) :
inline the mirror list (since fetching it causes weird network problems). Fix the handling of relative urls in ftp media when fetching hdlists file.
Diffstat (limited to 'perl-install/pkgs.pm')
-rw-r--r--perl-install/pkgs.pm7
1 files changed, 4 insertions, 3 deletions
diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm
index 1e0694503..93e02cf3c 100644
--- a/perl-install/pkgs.pm
+++ b/perl-install/pkgs.pm
@@ -390,7 +390,8 @@ sub psUpdateHdlistsDeps {
sub psUsingHdlists {
my ($o, $method, $o_hdlistsprefix, $o_packages, $o_initialmedium, $o_callback) = @_;
my $prefix = $o->{prefix};
- my $listf = install_any::getFile($o_hdlistsprefix ? "$o_hdlistsprefix/media/media_info/hdlists" : 'media/media_info/hdlists')
+ my $is_ftp = $o_hdlistsprefix =~ /^ftp:/;
+ my $listf = install_any::getFile($o_hdlistsprefix && !$is_ftp ? "$o_hdlistsprefix/media/media_info/hdlists" : 'media/media_info/hdlists')
or die "no hdlists found";
my ($suppl_CDs, $deselectionAllowed) = (0, 0);
if (!$o_packages) {
@@ -409,14 +410,14 @@ sub psUsingHdlists {
#- we'll ask afterwards for supplementary CDs, if the hdlists file contains
#- a line that begins with "suppl"
if (/^suppl/) { $suppl_CDs = 1; next }
- #- if the hdlists contains a line "askmedia", delection of media found
+ #- if the hdlists contains a line "askmedia", deletion of media found
#- in this hdlist is allowed
if (/^askmedia/) { $deselectionAllowed = 1; next }
my $cdsuppl = index($medium_name, 's') >= 0;
m/^\s*(noauto:)?(hdlist\S*\.cz2?)\s+(\S+)\s*(.*)$/ or die qq(invalid hdlist description "$_" in hdlists file);
push @hdlists, [ $2, $medium_name, $3, $4, !$1,
#- hdlist path, suppl CDs are mounted on /mnt/cdrom :
- $o_hdlistsprefix ? "$o_hdlistsprefix/media/media_info/$2" : undef,
+ $o_hdlistsprefix ? ($is_ftp ? "media/media_info/$2" : "$o_hdlistsprefix/media/media_info/$2") : undef,
];
$cdsuppl ? ($medium_name = ($medium_name + 1) . 's') : ++$medium_name;
}