summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorMartin Whitaker <mageia@martin-whitaker.me.uk>2020-12-10 14:13:46 +0000
committerMartin Whitaker <mageia@martin-whitaker.me.uk>2020-12-10 14:14:12 +0000
commitc5e51a435098a211910d02e801523c52df1214c4 (patch)
treebbb45136e9417c0a91b8d74a905c83257390c46a /perl-install
parent4b42aeab5539b6e05d62e4d24cfb70e789f556e0 (diff)
downloaddrakx-c5e51a435098a211910d02e801523c52df1214c4.tar
drakx-c5e51a435098a211910d02e801523c52df1214c4.tar.gz
drakx-c5e51a435098a211910d02e801523c52df1214c4.tar.bz2
drakx-c5e51a435098a211910d02e801523c52df1214c4.tar.xz
drakx-c5e51a435098a211910d02e801523c52df1214c4.zip
installer: support https in media URL (mga#27776)
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/install/NEWS2
-rw-r--r--perl-install/install/media.pm4
2 files changed, 4 insertions, 2 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index a30649421..1af0987b2 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,5 @@
+- support https in media URL (mga#27776)
+
Version 18.37 - 5 December 2020
- recognize more rtw88_*
diff --git a/perl-install/install/media.pm b/perl-install/install/media.pm
index 4b9360045..7d00f8c9c 100644
--- a/perl-install/install/media.pm
+++ b/perl-install/install/media.pm
@@ -630,8 +630,8 @@ sub _get_media_url {
$uri .= "/$arch" if -d "$uri/$arch";
}
} else {
- $uri = $o->{stage2_phys_medium}{url} =~ m!^(http|ftp)://! && $o->{stage2_phys_medium}{url} ||
- $phys_medium->{method} =~ m!^(ftp|http)://! && $phys_medium->{method} || '/tmp/image';
+ $uri = $o->{stage2_phys_medium}{url} =~ m!^(https?|ftp)://! && $o->{stage2_phys_medium}{url} ||
+ $phys_medium->{method} =~ m!^(ftp|https?)://! && $phys_medium->{method} || '/tmp/image';
}
$uri;
}