summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--NEWS2
-rw-r--r--urpm/media.pm5
2 files changed, 6 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 0a3f0694..c6d9f2fb 100644
--- a/NEWS
+++ b/NEWS
@@ -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'}) {