summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2003-10-21 13:59:33 +0000
committerFrancois Pons <fpons@mandriva.com>2003-10-21 13:59:33 +0000
commit371e2c34db78c3c1eb41e47318de611ee8d2c807 (patch)
tree569e5399557e0b302d3455e6ed279b799de764e0
parent5fede50bd0d8bf944331342e2cdb6e3ccd8e6d1e (diff)
downloadurpmi-371e2c34db78c3c1eb41e47318de611ee8d2c807.tar
urpmi-371e2c34db78c3c1eb41e47318de611ee8d2c807.tar.gz
urpmi-371e2c34db78c3c1eb41e47318de611ee8d2c807.tar.bz2
urpmi-371e2c34db78c3c1eb41e47318de611ee8d2c807.tar.xz
urpmi-371e2c34db78c3c1eb41e47318de611ee8d2c807.zip
fixed signature checking on first package when using --media and selecting other
media having different signature that the first one.
-rw-r--r--urpm.pm7
1 files changed, 5 insertions, 2 deletions
diff --git a/urpm.pm b/urpm.pm
index 721b13c4..77e17c0c 100644
--- a/urpm.pm
+++ b/urpm.pm
@@ -3287,10 +3287,13 @@ sub check_sources_signatures {
if ($verif =~ /NOT OK/) {
$invalid_sources{$filepath} = N("Invalid signature (%s)", $verif);
} else {
- unless ($medium && $medium->{start} <= $id && $id <= $medium->{end}) {
+ #print "+++$medium->{name}:$medium->{start}:$medium->{end}:$id\n";
+ unless ($medium &&
+ defined $medium->{start} && $medium->{start} <= $id &&
+ defined $medium->{end} && $id <= $medium->{end}) {
$medium = undef;
foreach (@{$urpm->{media}}) {
- $_->{start} <= $id && $id <= $_->{end} and $medium = $_, last;
+ defined $_->{start} && $_->{start} <= $id && defined $_->{end} && $id <= $_->{end} and $medium = $_, last;
}
}