aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2006-09-19 10:54:45 +0000
committerThierry Vignaud <tv@mandriva.org>2006-09-19 10:54:45 +0000
commite6153a16f0662d5308661bd6937d25120b364405 (patch)
treeede70635247996f5aeb747a4c05c75dada3104ec
parent06a10f6fce93758ce5cd268edd42584d30fcf435 (diff)
downloadrpmdrake-e6153a16f0662d5308661bd6937d25120b364405.tar
rpmdrake-e6153a16f0662d5308661bd6937d25120b364405.tar.gz
rpmdrake-e6153a16f0662d5308661bd6937d25120b364405.tar.bz2
rpmdrake-e6153a16f0662d5308661bd6937d25120b364405.tar.xz
rpmdrake-e6153a16f0662d5308661bd6937d25120b364405.zip
(make_url_mirror) kill old code now unused and move there management of missing media.cfg for updates
-rwxr-xr-xedit-urpm-sources.pl2
-rw-r--r--rpmdrake.pm9
2 files changed, 3 insertions, 8 deletions
diff --git a/edit-urpm-sources.pl b/edit-urpm-sources.pl
index b86cbcaa..b2b97dc4 100755
--- a/edit-urpm-sources.pl
+++ b/edit-urpm-sources.pl
@@ -102,7 +102,7 @@ Is it ok to continue?", $rpmdrake::mandrake_release),
ref $mirror or return;
my $m = $mirror->{url};
my $is_update = $mirror->{type} eq 'updates';
- $m .= '/media/main/updates' if $is_update; # because updates media do not provide media.cfg yet
+ $m = make_url_mirror($m) if $is_update; # because updates media do not provide media.cfg yet
my $wait = wait_msg_(N("Please wait, adding media..."));
my $url = $m;
my $medium_name;
diff --git a/rpmdrake.pm b/rpmdrake.pm
index 833221b6..0a96b685 100644
--- a/rpmdrake.pm
+++ b/rpmdrake.pm
@@ -612,13 +612,8 @@ by Mandriva Linux Official Updates.")), %options
sub make_url_mirror {
my ($mirror) = @_;
- if ($mirror =~ m!/(?:RPMS|media/main)/?\Z!) {
- "$mirror/";
- } else {
- my ($class, $release) = $mandrake_release =~ /(\S+)\s+release\s+(\S+)/;
- $class !~ /linux/i and $release = lc($class) . "/$release"; #- handle subdirectory for corporate/clustering/etc
- "$mirror/$release/main_updates/";
- }
+ # because updates media do not provide media.cfg yet
+ $mirror . '/media/main/updates'
}
sub make_url_mirror_dist {