aboutsummaryrefslogtreecommitdiffstats
path: root/lib/Iurt/Urpmi.pm
diff options
context:
space:
mode:
authorMarcelo Leitner <mrl@mandriva.com>2007-06-15 17:18:23 +0000
committerMarcelo Leitner <mrl@mandriva.com>2007-06-15 17:18:23 +0000
commit4725311c93db97c21df6182f4074129a02f74c01 (patch)
tree52dfd41d063fefae8f08dd23c9eaa74f1abeaf0f /lib/Iurt/Urpmi.pm
parenta8ec2f4a2099ab52c86bee8160b90abb3d02634e (diff)
downloadiurt-4725311c93db97c21df6182f4074129a02f74c01.tar
iurt-4725311c93db97c21df6182f4074129a02f74c01.tar.gz
iurt-4725311c93db97c21df6182f4074129a02f74c01.tar.bz2
iurt-4725311c93db97c21df6182f4074129a02f74c01.tar.xz
iurt-4725311c93db97c21df6182f4074129a02f74c01.zip
- --additional-media option on --chrooted-urpmi one, as they are almost clones.
Diffstat (limited to 'lib/Iurt/Urpmi.pm')
-rw-r--r--lib/Iurt/Urpmi.pm12
1 files changed, 5 insertions, 7 deletions
diff --git a/lib/Iurt/Urpmi.pm b/lib/Iurt/Urpmi.pm
index c004def..091630d 100644
--- a/lib/Iurt/Urpmi.pm
+++ b/lib/Iurt/Urpmi.pm
@@ -110,17 +110,15 @@ sub urpmi_command {
}
}
- my $count = 0;
- foreach my $m (@{$run->{additional_media}}) {
- my $name = $m;
+ foreach my $m (@{$run->{additional_media}{media}}) {
+ my $name = "$run->{additional_media}{repository}_$m";
$name =~ s![/:]!_!g;
my $url;
- if (($m =~ m!^(http:|ftp:)!)) {
- $url = $m;
+ if (($run->{additional_media}{repository} =~ m!^(http:|ftp:)!)) {
+ $url = $run->{additional_media}{repository};
}
else {
- $url = "/urpmi_medias/$count";
- $count++;
+ $url = "/urpmi_medias/media/$m";
}
if (!add_media($self, $chroot_tmp, $name, "$name $url")) {
plog("ERROR: Unable to add media $m");