diff options
Diffstat (limited to 'urpm')
| -rw-r--r-- | urpm/args.pm | 6 | ||||
| -rw-r--r-- | urpm/media.pm | 6 |
2 files changed, 3 insertions, 9 deletions
diff --git a/urpm/args.pm b/urpm/args.pm index 5b5f9920..6e281473 100644 --- a/urpm/args.pm +++ b/urpm/args.pm @@ -283,7 +283,7 @@ my %options_spec = ( 'urpmi.update' => { a => \$options{all}, - c => sub { $options{noclean} = 0 }, + c => sub {}, # obsolete f => sub { ++$options{force}; $options{probe_with} = 'rpms' if $options{force} == 2 }, z => sub { ++$options{compress} }, update => \$options{update}, @@ -380,14 +380,14 @@ foreach my $k ("help|h", "version", "wget", "curl", "prozilla", "aria2", "proxy= $options_spec{urpmq}{$k} = $options_spec{urpmi}{$k}; } -foreach my $k ("help|h", "wget", "curl", "prozilla", "aria2", "proxy=s", "proxy-user=s", "c", "f", "z", +foreach my $k ("help|h", "wget", "curl", "prozilla", "aria2", "proxy=s", "proxy-user=s", "f", "z", "limit-rate=s", "no-md5sum", "update", "norebuild!", "probe-rpms", "wget-options=s", "curl-options=s", "rsync-options=s", "prozilla-options=s", "aria2-options=s", '<>') { $options_spec{'urpmi.addmedia'}{$k} = $options_spec{'urpmi.update'}{$k}; } -foreach my $k ("a", "c", '<>') { +foreach my $k ("a", '<>') { $options_spec{'urpmi.removemedia'}{$k} = $options_spec{'urpmi.update'}{$k}; } foreach my $k ("y") { diff --git a/urpm/media.pm b/urpm/media.pm index 20d34b64..5a848a4e 100644 --- a/urpm/media.pm +++ b/urpm/media.pm @@ -1357,7 +1357,6 @@ sub _update_media__handle_some_flags { #- callback : UI callback #- forcekey : force retrieval of pubkey #- force : try to force rebuilding base files -#- noclean : keep old files in the header cache directory #- nomd5sum : don't verify MD5SUM of retrieved files #- nopubkey : don't use rpm pubkeys #- probe_with : probe synthesis or rpms @@ -1392,11 +1391,6 @@ sub update_media { } if ($urpm->{modified}) { - if ($options{noclean}) { - #- clean headers cache directory to remove everything that is no longer - #- useful according to the depslist. - urpm::remove_obsolete_headers_in_cache($urpm); - } #- write config files in any case write_config($urpm); urpm::download::dump_proxy_config(); |