aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2012-04-17 20:50:09 +0000
committerThierry Vignaud <tv@mageia.org>2012-04-17 20:50:09 +0000
commit587300f58d3f1ed6f3e3c701a14d612977bcefa0 (patch)
treefc67fbcb2a0f341f10c075f93af317eb3e6ee044
parent65f9141e16fe8d855da9576f9a31e4d4d3cc8ca2 (diff)
downloadiurt-587300f58d3f1ed6f3e3c701a14d612977bcefa0.tar
iurt-587300f58d3f1ed6f3e3c701a14d612977bcefa0.tar.gz
iurt-587300f58d3f1ed6f3e3c701a14d612977bcefa0.tar.bz2
iurt-587300f58d3f1ed6f3e3c701a14d612977bcefa0.tar.xz
iurt-587300f58d3f1ed6f3e3c701a14d612977bcefa0.zip
(clean_chroot) rsync is a remote protocol w/o any local mount point too
-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 b506d01..38cf8c5 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):)/) {
+ if ($rep !~ m/^(ftp|http|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 f6b3f79..97ee516 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):/;
+ $self->{use__urpmi_root} = $config->{repository} =~ m/^(ftp|http|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):!) {
+ if ($run->{additional_media}{repository} =~ m!^(ftp|http|rsync):!) {
$url = $run->{additional_media}{repository};
}
else {