From 4ccdb36ac278269974f0edfceea9120ac3995c7e Mon Sep 17 00:00:00 2001
From: Martin Whitaker <mageia@martin-whitaker.me.uk>
Date: Wed, 30 Nov 2022 15:04:11 +0000
Subject: installer: more fixes to support https media URLs.

---
 perl-install/install/media.pm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'perl-install/install')

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}";
-- 
cgit v1.2.1