summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2005-02-16 14:37:44 +0000
committerRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2005-02-16 14:37:44 +0000
commit39aa7227067729f1a630aebbbe2abc0644a47586 (patch)
tree2783e1e190d8c4f66f5a0ad322b3db524e1bffe9
parentebe338d026ca9f316f9c8079c1689e5084b07e31 (diff)
downloadurpmi-39aa7227067729f1a630aebbbe2abc0644a47586.tar
urpmi-39aa7227067729f1a630aebbbe2abc0644a47586.tar.gz
urpmi-39aa7227067729f1a630aebbbe2abc0644a47586.tar.bz2
urpmi-39aa7227067729f1a630aebbbe2abc0644a47586.tar.xz
urpmi-39aa7227067729f1a630aebbbe2abc0644a47586.zip
Fix precedence nit with verify-rpm option set per media
-rwxr-xr-xurpmi3
1 files changed, 1 insertions, 2 deletions
diff --git a/urpmi b/urpmi
index 3142e97d..69e4cf57 100755
--- a/urpmi
+++ b/urpmi
@@ -469,7 +469,6 @@ if (@root_only) {
message_input("$msg:\n$p\n$msg2" . N(" (Y/n) "), $force && $yesexpr, boolean => 1) =~ /[$noexpr]/ and exit 0;
}
-#- if not root, the list become invisible and no download will be possible.
my ($local_sources, $list) = $urpm->get_source_packages($state->{selected},
clean_all => $clean,
clean_other => !$noclean && $urpm->{options}{'pre-clean'});
@@ -536,7 +535,7 @@ foreach my $set (@{$state->{transaction} || []}) {
);
my %transaction_sources_install = %{$urpm->extract_packages_to_install(\%transaction_sources) || {}};
- if (!$force && $urpm->{options}{'verify-rpm'} || grep { $_->{'verify-rpm'} } @{$urpm->{media}}) {
+ 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);
if (@bad_signatures) {