diff options
| author | Thierry Vignaud <tv@mageia.org> | 2012-04-17 20:50:05 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mageia.org> | 2012-04-17 20:50:05 +0000 |
| commit | 65f9141e16fe8d855da9576f9a31e4d4d3cc8ca2 (patch) | |
| tree | 0effd083d6adcf406b42863e9e2ee9e2e632f1a7 /lib | |
| parent | 6b2fae8cad48c6541a5f75819d44fa7686b92d5e (diff) | |
| download | iurt-65f9141e16fe8d855da9576f9a31e4d4d3cc8ca2.tar iurt-65f9141e16fe8d855da9576f9a31e4d4d3cc8ca2.tar.gz iurt-65f9141e16fe8d855da9576f9a31e4d4d3cc8ca2.tar.bz2 iurt-65f9141e16fe8d855da9576f9a31e4d4d3cc8ca2.tar.xz iurt-65f9141e16fe8d855da9576f9a31e4d4d3cc8ca2.zip | |
(clean_chroot,new,urpmi_command) sort
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Iurt/Chroot.pm | 2 | ||||
| -rw-r--r-- | lib/Iurt/Urpmi.pm | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/Iurt/Chroot.pm b/lib/Iurt/Chroot.pm index b40fe41..b506d01 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/^(http|ftp):)/) { + if ($rep !~ m/^(ftp|http):)/) { 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 73811bc..f6b3f79 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/^(http|ftp):/; + $self->{use__urpmi_root} = $config->{repository} =~ m/^(ftp|http):/; $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!^(http|ftp):!) { + if ($run->{additional_media}{repository} =~ m!^(ftp|http):!) { $url = $run->{additional_media}{repository}; } else { |