diff options
| -rwxr-xr-x | gurpmi2 | 2 | ||||
| -rw-r--r-- | urpm.pm | 4 | ||||
| -rwxr-xr-x | urpmi | 2 |
3 files changed, 4 insertions, 4 deletions
@@ -259,7 +259,7 @@ sub do_install_3 () { ); my %transaction_sources_install = %{$urpm->extract_packages_to_install(\%transaction_sources, $state) || {}}; if ($urpm->{options}{'verify-rpm'} || grep { $_->{'verify-rpm'} } @{$urpm->{media}}) { - my @bad_signatures = $urpm->check_sources_signatures(\%transaction_sources_install, \%transaction_sources, translate => 1); + my @bad_signatures = $urpm->check_sources_signatures(\%transaction_sources_install, \%transaction_sources); if (@bad_signatures) { ask_continue_blocking(N( "The following packages have bad signatures:\n%s\n\nDo you want to continue installation ?", @@ -3176,7 +3176,7 @@ sub translate_why_removed_one { $fullname . ($s ? "\n ($s)" : ''); } -#- options: callback, basename, translate +#- options: callback, basename sub check_sources_signatures { my ($urpm, $sources_install, $sources, %options) = @_; sort(_check_sources_signatures($urpm, $sources_install, %options), @@ -3237,7 +3237,7 @@ sub _check_sources_signatures { ); } } - map { ($options{basename} ? basename($_) : $_) . ($options{translate} ? ": $invalid_sources{$_}" : "") } + map { ($options{basename} ? basename($_) : $_) . ": $invalid_sources{$_}" } keys %invalid_sources; } @@ -642,7 +642,7 @@ foreach my $set (@{$state->{transaction} || []}) { my %transaction_sources_install = %{$urpm->extract_packages_to_install(\%transaction_sources, $state) || {}}; if (!$force && ($urpm->{options}{'verify-rpm'} || grep { $_->{'verify-rpm'} } @{$urpm->{media}})) { - my @bad_signatures = $urpm->check_sources_signatures(\%transaction_sources_install, \%transaction_sources, translate => 1); + my @bad_signatures = $urpm->check_sources_signatures(\%transaction_sources_install, \%transaction_sources); if (@bad_signatures) { my $msg = N("The following packages have bad signatures"); |