From c5b13377fad1b2bdac6f0ac39c41d3e46af30426 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Tue, 23 Oct 2007 01:10:24 +0000 Subject: (add_distrib_update_media) factorize computing unique media names --- Rpmdrake/edit_urpm_sources.pm | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'Rpmdrake/edit_urpm_sources.pm') diff --git a/Rpmdrake/edit_urpm_sources.pm b/Rpmdrake/edit_urpm_sources.pm index 79cf19e2..b44abdd8 100644 --- a/Rpmdrake/edit_urpm_sources.pm +++ b/Rpmdrake/edit_urpm_sources.pm @@ -137,15 +137,7 @@ Is it ok to continue?", $distro), ) or return 0; ref $mirror or return; my $wait = wait_msg(N("Please wait, adding media...")); - my $medium_name; - if ($rpmdrake::mandrake_release =~ /(\d+\.\d+) \((\w+)\)/) { - $medium_name = $2 . $1 . '-'; - } else { - $medium_name = 'distrib'; - } - #- ensure a unique medium name - my $initial_number = 1 + max map { $_->{name} =~ /\(\Q$medium_name\E(\d+)\b/ ? $1 : 0 } @{$urpm->{media}}; - add_distrib_update_media($urpm, $medium_name, $mirror, initial_number => $initial_number); + add_distrib_update_media($urpm, $mirror); remove_wait_msg($wait); return 1; } -- cgit v1.2.1