summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2013-03-16 09:03:13 +0000
committerThierry Vignaud <tv@mageia.org>2013-03-16 09:03:13 +0000
commit725a05e33713f34c92c86bae92b65cbe7a78bddb (patch)
tree02655ce0d3f1e43922ccafb0f6d96d7c8523685b
parenteadc8bee46e2c2e43ec9f6623b22f80e9ed2c968 (diff)
downloadurpmi-725a05e33713f34c92c86bae92b65cbe7a78bddb.tar
urpmi-725a05e33713f34c92c86bae92b65cbe7a78bddb.tar.gz
urpmi-725a05e33713f34c92c86bae92b65cbe7a78bddb.tar.bz2
urpmi-725a05e33713f34c92c86bae92b65cbe7a78bddb.tar.xz
urpmi-725a05e33713f34c92c86bae92b65cbe7a78bddb.zip
simplify
-rw-r--r--urpm/media.pm5
1 files changed, 1 insertions, 4 deletions
diff --git a/urpm/media.pm b/urpm/media.pm
index 3224407d..7898b194 100644
--- a/urpm/media.pm
+++ b/urpm/media.pm
@@ -764,10 +764,7 @@ sub non_ignored_media {
sub all_media_to_update {
my ($urpm, $b_only_marked_update) = @_;
- grep { !$_->{ignore}
- && !$_->{static} && !urpm::is_cdrom_url($_->{url}) && !$_->{iso}
- && (!$b_only_marked_update || $_->{update});
- } @{$urpm->{media} || []};
+ grep { !$_->{static} && !urpm::is_cdrom_url($_->{url}) && !$_->{iso} } non_ignored_media($urpm, $b_only_marked_update);
}
sub parse_media {