aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2012-04-17 20:50:12 +0000
committerThierry Vignaud <tv@mageia.org>2012-04-17 20:50:12 +0000
commit69cd89c0ee733a2b8c77db51fd39f9fd515e925a (patch)
tree2b765c4c9a1baf992a79f8fb9679234264113d5c /lib
parent587300f58d3f1ed6f3e3c701a14d612977bcefa0 (diff)
downloadiurt-69cd89c0ee733a2b8c77db51fd39f9fd515e925a.tar
iurt-69cd89c0ee733a2b8c77db51fd39f9fd515e925a.tar.gz
iurt-69cd89c0ee733a2b8c77db51fd39f9fd515e925a.tar.bz2
iurt-69cd89c0ee733a2b8c77db51fd39f9fd515e925a.tar.xz
iurt-69cd89c0ee733a2b8c77db51fd39f9fd515e925a.zip
(clean_chroot,new,urpmi_command) https is a supported protocol too
Diffstat (limited to 'lib')
-rw-r--r--lib/Iurt/Chroot.pm2
-rw-r--r--lib/Iurt/Urpmi.pm4
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/Iurt/Chroot.pm b/lib/Iurt/Chroot.pm
index 38cf8c5..f0d1e4b 100644
--- a/lib/Iurt/Chroot.pm
+++ b/lib/Iurt/Chroot.pm
@@ -92,7 +92,7 @@ sub clean_chroot {
if ($run->{additional_media} && $run->{additional_media}{repository}) {
my $rep = $run->{additional_media}{repository};
- if ($rep !~ m/^(ftp|http|rsync):)/) {
+ if ($rep !~ m/^(ftp|https?|rsync):)/) {
my $mount_point = "$chroot/urpmi_medias";
my $url = $rep;
$url =~ s!^file://!!;
diff --git a/lib/Iurt/Urpmi.pm b/lib/Iurt/Urpmi.pm
index 97ee516..df4a5bd 100644
--- a/lib/Iurt/Urpmi.pm
+++ b/lib/Iurt/Urpmi.pm
@@ -30,7 +30,7 @@ sub new {
plog('DEBUG', "installation media: $run->{chrooted_media}");
}
- $self->{use__urpmi_root} = $config->{repository} =~ m/^(ftp|http|rsync):/;
+ $self->{use__urpmi_root} = $config->{repository} =~ m/^(ftp|https?|rsync):/;
$self->{distrib_url} = "$config->{repository}/$run->{distro}/$run->{my_arch}";
$self;
@@ -120,7 +120,7 @@ sub urpmi_command {
$name =~ s![/:]!_!g;
my $url;
- if ($run->{additional_media}{repository} =~ m!^(ftp|http|rsync):!) {
+ if ($run->{additional_media}{repository} =~ m!^(ftp|https?|rsync):!) {
$url = $run->{additional_media}{repository};
}
else {