diff options
| author | Martin Whitaker <mageia@martin-whitaker.me.uk> | 2022-11-30 15:04:11 +0000 |
|---|---|---|
| committer | Martin Whitaker <mageia@martin-whitaker.me.uk> | 2022-11-30 15:04:11 +0000 |
| commit | 4ccdb36ac278269974f0edfceea9120ac3995c7e (patch) | |
| tree | 6b3f48dd436e188876f86afdbaf034c026ed6c6f | |
| parent | a3d2850eff2edbb90351898f911a4a162dd1f6c4 (diff) | |
| download | drakx-4ccdb36ac278269974f0edfceea9120ac3995c7e.tar drakx-4ccdb36ac278269974f0edfceea9120ac3995c7e.tar.gz drakx-4ccdb36ac278269974f0edfceea9120ac3995c7e.tar.bz2 drakx-4ccdb36ac278269974f0edfceea9120ac3995c7e.tar.xz drakx-4ccdb36ac278269974f0edfceea9120ac3995c7e.zip | |
installer: more fixes to support https media URLs.
| -rw-r--r-- | perl-install/install/media.pm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/perl-install/install/media.pm b/perl-install/install/media.pm index 7d00f8c9c..149deffc3 100644 --- a/perl-install/install/media.pm +++ b/perl-install/install/media.pm @@ -339,7 +339,7 @@ sub get_file_and_size { if ($f =~ m|^https?://|) { require install::http; install::http::get_file_and_size($f); - } elsif (member($phys_m->{method}, qw(ftp http))) { + } elsif (member($phys_m->{method}, qw(ftp http https))) { require install::http; install::http::get_file_and_size_($f, $phys_m->{url}); } elsif ($f =~ m!^/!) { @@ -621,7 +621,7 @@ sub _get_media_url { my ($o, $phys_medium) = @_; my $uri; if ($phys_medium->{is_suppl}) { - if (member($phys_medium->{method}, qw(ftp http))) { + if (member($phys_medium->{method}, qw(ftp http https))) { $uri = $phys_medium->{url}; $uri =~ s!/media$!!; } elsif (member($phys_medium->{method}, qw(cdrom nfs))) { @@ -826,7 +826,7 @@ sub copy_rpms_on_disk { sub _get_medium_dir { my ($phys_m) = @_; - if (member($phys_m->{method}, qw(ftp http cdrom))) { + if (member($phys_m->{method}, qw(ftp http https cdrom))) { $phys_m->{url}; } else { "$phys_m->{mntpoint}$phys_m->{rel_path}"; |