diff options
author | Pascal Rigaux <pixel@mandriva.com> | 2008-11-13 10:55:44 +0000 |
---|---|---|
committer | Pascal Rigaux <pixel@mandriva.com> | 2008-11-13 10:55:44 +0000 |
commit | 2cdcb72bc29a4ddce0991f48fab9af0d57f4945e (patch) | |
tree | 517157e8425ac5e2e6df17f52f2ea75ca7aa468b /urpm | |
parent | 46f0bfca5664a0067f93c16f78d7f06900a4c9a2 (diff) | |
download | urpmi-2cdcb72bc29a4ddce0991f48fab9af0d57f4945e.tar urpmi-2cdcb72bc29a4ddce0991f48fab9af0d57f4945e.tar.gz urpmi-2cdcb72bc29a4ddce0991f48fab9af0d57f4945e.tar.bz2 urpmi-2cdcb72bc29a4ddce0991f48fab9af0d57f4945e.tar.xz urpmi-2cdcb72bc29a4ddce0991f48fab9af0d57f4945e.zip |
create update_those_media() out of update_media()
(to be used in urpmi.update)
Diffstat (limited to 'urpm')
-rw-r--r-- | urpm/media.pm | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/urpm/media.pm b/urpm/media.pm index 807eae15..175da9d4 100644 --- a/urpm/media.pm +++ b/urpm/media.pm @@ -1673,6 +1673,16 @@ sub update_media { $urpm->{media} or return; # verify that configuration has been read + if ($options{all}) { + $_->{modified} ||= 1 foreach all_media_to_update($urpm); + } + + update_those_media($urpm, [ grep { $_->{modified} } non_ignored_media($urpm) ], %options); +} + +sub update_those_media { + my ($urpm, $media, %options) = @_; + $options{nopubkey} ||= $urpm->{options}{nopubkey}; #- examine each medium to see if one of them needs to be updated. @@ -1680,12 +1690,8 @@ sub update_media { #- synthesis file, else build it from rpm files. clean($urpm); - if ($options{all}) { - $_->{modified} ||= 1 foreach all_media_to_update($urpm); - } - my %updates_result; - foreach my $medium (grep { $_->{modified} } non_ignored_media($urpm)) { + foreach my $medium (@$media) { #- don't ever update static media $medium->{static} and next; |