diff options
| author | Thierry Vignaud <tv@mandriva.org> | 2008-02-21 18:24:30 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mandriva.org> | 2008-02-21 18:24:30 +0000 |
| commit | f7ea1aebb30d5eda6f406e14a78a13131a7d120e (patch) | |
| tree | b6228f62e9aab9ff7b0363dfcabc0f6220391328 /rpmdrake.pm | |
| parent | 660842368965bc2b8f6e46c63c53149aed1b7c90 (diff) | |
| download | rpmdrake-f7ea1aebb30d5eda6f406e14a78a13131a7d120e.tar rpmdrake-f7ea1aebb30d5eda6f406e14a78a13131a7d120e.tar.gz rpmdrake-f7ea1aebb30d5eda6f406e14a78a13131a7d120e.tar.bz2 rpmdrake-f7ea1aebb30d5eda6f406e14a78a13131a7d120e.tar.xz rpmdrake-f7ea1aebb30d5eda6f406e14a78a13131a7d120e.zip | |
(add_distrib_update_media,easy_add_callback,mirrors) only ask for 'distrib' style URLs
Diffstat (limited to 'rpmdrake.pm')
| -rw-r--r-- | rpmdrake.pm | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/rpmdrake.pm b/rpmdrake.pm index afa4c599..27da6150 100644 --- a/rpmdrake.pm +++ b/rpmdrake.pm @@ -512,8 +512,7 @@ sub mirrors { $res or do { c::set_tagged_utf8($res); die $res }; return cat_($file); }); - my @mirrors = @{ mirror::list(common::parse_LDAP_namespace_structure(cat_('/etc/product.id')), - ($want_base_distro ? 'distrib' : 'updates')) || [] }; + my @mirrors = @{ mirror::list(common::parse_LDAP_namespace_structure(cat_('/etc/product.id')), 'distrib') || [] }; require timezone; my $tz = ${timezone::read()}{timezone}; foreach my $mirror (@mirrors) { @@ -871,7 +870,6 @@ It will be disabled.", sub add_distrib_update_media { my ($urpm, $mirror, %options) = @_; - my $is_update = $mirror->{type} eq 'updates'; #- ensure a unique medium name my $medium_name = $rpmdrake::mandrake_release =~ /(\d+\.\d+) \((\w+)\)/ ? $2 . $1 . '-' : 'distrib'; my $initial_number = 1 + max map { $_->{name} =~ /\(\Q$medium_name\E(\d+)\b/ ? $1 : 0 } @{$urpm->{media}}; @@ -880,7 +878,6 @@ sub add_distrib_update_media { { nolock => 1, distrib => 1 }, $medium_name, $mirror->{url}, probe_with => 'synthesis', initial_number => $initial_number, %options, usedistrib => 1, - if_($is_update, only_updates => 1), ); } |