diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2008-09-23 15:56:33 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2008-09-23 15:56:33 +0000 |
| commit | f73da7283d95a9ffa0710006aa43c1d5bbc1a826 (patch) | |
| tree | 93bc888687a9912c5caf769c1a896cd6df75537e | |
| parent | 787a9bd8b3183fb7469a4280555767d2cf646162 (diff) | |
| download | urpmi-f73da7283d95a9ffa0710006aa43c1d5bbc1a826.tar urpmi-f73da7283d95a9ffa0710006aa43c1d5bbc1a826.tar.gz urpmi-f73da7283d95a9ffa0710006aa43c1d5bbc1a826.tar.bz2 urpmi-f73da7283d95a9ffa0710006aa43c1d5bbc1a826.tar.xz urpmi-f73da7283d95a9ffa0710006aa43c1d5bbc1a826.zip | |
- urpmi.addmedia, urpmi.update:
o do not get "descriptions" on non "update" media since it's useless and
potentially slow
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | urpm/media.pm | 5 |
2 files changed, 6 insertions, 1 deletions
@@ -2,6 +2,8 @@ (needed for aria2 to handle mirrors not having some media_info/*) - urpmi.addmedia, urpmi.update: o only look for "descriptions" in media_info/ + o do not get "descriptions" on non update media since it's useless and + potentially slow - urpmi.addmedia: o --distrib: do not skip "debug_for=" media (debug media will be added with flag "ignore" if noauto=1) diff --git a/urpm/media.pm b/urpm/media.pm index bb2a0682..9619717b 100644 --- a/urpm/media.pm +++ b/urpm/media.pm @@ -1496,7 +1496,10 @@ sub _get_pubkey_and_descriptions { my $local = file_from_local_medium($medium); - ($local ? \&get_descriptions_local : \&get_descriptions_remote)->($urpm, $medium); + # do not get "descriptions" on non "update" media since it's useless and potentially slow + if ($medium->{update}) { + ($local ? \&get_descriptions_local : \&get_descriptions_remote)->($urpm, $medium); + } #- examine if a pubkey file is available. if (!$nopubkey && !$medium->{'key-ids'}) { |