summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2012-08-31 16:44:35 +0000
committerThierry Vignaud <tv@mageia.org>2012-08-31 16:44:35 +0000
commitc04350c65278067d5f88c30fd88fd2e1ea61438c (patch)
treeaa44aa4c4bfe89f412ad191fdad16e204cd7461f
parent5ea1e2b5e04664190463d924933339e27930db99 (diff)
downloadurpmi-c04350c65278067d5f88c30fd88fd2e1ea61438c.tar
urpmi-c04350c65278067d5f88c30fd88fd2e1ea61438c.tar.gz
urpmi-c04350c65278067d5f88c30fd88fd2e1ea61438c.tar.bz2
urpmi-c04350c65278067d5f88c30fd88fd2e1ea61438c.tar.xz
urpmi-c04350c65278067d5f88c30fd88fd2e1ea61438c.zip
(_check) do not ask about _virtual_ media without keys when using 'urpmi --use-distrib'
aka downgrade missing medium key check question to a warning for virtual media without keys when using urpmi --use-distrib (fix testsuite)
-rw-r--r--NEWS2
-rw-r--r--urpm/signature.pm2
2 files changed, 4 insertions, 0 deletions
diff --git a/NEWS b/NEWS
index c94db22e..bc595b35 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,7 @@
- fix testsuite
- security:
+ o downgrade missing medium key check question to a warning for virtual media
+ without keys when using urpmi --use-distrib
o honor per medium "verify-rpm" option for missing signature check
o media have keys, not signatures
- unrequested package list management (for orphans) (mga#7167):
diff --git a/urpm/signature.pm b/urpm/signature.pm
index 7e6cc368..94a2118f 100644
--- a/urpm/signature.pm
+++ b/urpm/signature.pm
@@ -74,6 +74,8 @@ sub _check {
} elsif (!$valid_ids) {
$invalid_sources{$filepath} = N("Missing signature (%s)", $verif);
}
+ } elsif ($urpm::args::options{usedistrib} && $medium->{virtual}) {
+ $urpm->{info}(N("SECURITY: Medium \"%s\" has no key (%s)!", $verif));
} else {
$invalid_sources{$filepath} = N("Medium without key (%s)", $verif);
}