diff options
author | Pascal Rigaux <pixel@mandriva.com> | 2006-11-20 11:45:56 +0000 |
---|---|---|
committer | Pascal Rigaux <pixel@mandriva.com> | 2006-11-20 11:45:56 +0000 |
commit | f87552ba669869339040ee1a72dd5844693dbac8 (patch) | |
tree | 47fa9127da0aa162c77df1ced05f2add95cfcdc4 | |
parent | 9bfd4dae83f3042f54a42582fefdfa12bfce5604 (diff) | |
download | urpmi-f87552ba669869339040ee1a72dd5844693dbac8.tar urpmi-f87552ba669869339040ee1a72dd5844693dbac8.tar.gz urpmi-f87552ba669869339040ee1a72dd5844693dbac8.tar.bz2 urpmi-f87552ba669869339040ee1a72dd5844693dbac8.tar.xz urpmi-f87552ba669869339040ee1a72dd5844693dbac8.zip |
cleanup
-rw-r--r-- | urpm.pm | 9 |
1 files changed, 4 insertions, 5 deletions
@@ -1874,17 +1874,16 @@ sub remove_obsolete_headers_in_cache { } } -#- handled flags: forcekey, all sub _update_media__handle_some_flags { - my ($urpm, $options) = @_; + my ($urpm, $forcekey, $all) = @_; foreach my $medium (grep { !$_->{ignore} } @{$urpm->{media}}) { - $options->{forcekey} and delete $medium->{'key-ids'}; + $forcekey and delete $medium->{'key-ids'}; if ($medium->{static}) { #- don't ever update static media $medium->{modified} = 0; - } elsif ($options->{all}) { + } elsif ($all) { #- if we're rebuilding all media, mark them as modified (except removable ones) $medium->{modified} ||= $medium->{url} !~ m!^removable!; } @@ -1925,7 +1924,7 @@ sub update_media { #- hdlist file, else build it from rpm files. $urpm->clean; - _update_media__handle_some_flags($urpm, \%options); + _update_media__handle_some_flags($urpm, $options{forcekey}, $options{all}); my $clean_cache = !$options{noclean}; my $second_pass; |