diff options
Diffstat (limited to 'Rpmdrake')
| -rw-r--r-- | Rpmdrake/edit_urpm_sources.pm | 10 | ||||
| -rw-r--r-- | Rpmdrake/pkg.pm | 2 |
2 files changed, 2 insertions, 10 deletions
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; } diff --git a/Rpmdrake/pkg.pm b/Rpmdrake/pkg.pm index bbd8d001..033b301e 100644 --- a/Rpmdrake/pkg.pm +++ b/Rpmdrake/pkg.pm @@ -212,7 +212,7 @@ launch the Software Media Manager, and then add a `Security updates' medium. Then, restart %s.", $rpmdrake::myname_update)), myexit(-1); - add_distrib_update_media($urpm, $update_name, $mirror); + add_distrib_update_media($urpm, $mirror); @update_medias = { name => $update_name }; #- hack to simulate a medium for parsing of descriptions } } |