create all_media_to_update() and use it

1 files changed, 10 insertions, 4 deletions

diff --git a/urpm/media.pm b/urpm/media.pm
index e13ff874..807eae15 100644
--- a/urpm/media.pm
+++ b/urpm/media.pm
@@ -654,6 +654,15 @@ sub non_ignored_media {
     grep { !$_->{ignore} && (!$b_only_marked_update || $_->{update}) } @{$urpm->{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} || []};
+}
+
 sub parse_media {
     my ($urpm, $options) = @_;
 
@@ -1672,10 +1681,7 @@ sub update_media {
     clean($urpm);
 
     if ($options{all}) {
-	foreach my $medium (non_ignored_media($urpm)) {
-	    #- if we're rebuilding all media, mark them as modified (except removable ones)
-	    $medium->{modified} ||= !urpm::is_cdrom_url($medium->{url}) && !$medium->{iso};
-	}
+	$_->{modified} ||= 1 foreach all_media_to_update($urpm);
     }
 
     my %updates_result;