summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xgurpmi22
-rw-r--r--urpm.pm4
-rwxr-xr-xurpmi2
3 files changed, 4 insertions, 4 deletions
diff --git a/gurpmi2 b/gurpmi2
index 772a3187..12aa722c 100755
--- a/gurpmi2
+++ b/gurpmi2
@@ -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 ?",
diff --git a/urpm.pm b/urpm.pm
index 0e52a0a0..f7958272 100644
--- a/urpm.pm
+++ b/urpm.pm
@@ -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;
}
diff --git a/urpmi b/urpmi
index 0a5b4db4..b0ee9cda 100755
--- a/urpmi
+++ b/urpmi
@@ -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");