summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2009-03-05 11:18:45 +0000
committerThierry Vignaud <tv@mandriva.org>2009-03-05 11:18:45 +0000
commit74d16092cd6f0d7ce2326ab69fc2c51277d378ea (patch)
treeb75a48f09e125ca93a425326a191cb0aea878128
parent1d4582f27b91e9741357c6df3d67b959b34427d5 (diff)
downloadurpmi-74d16092cd6f0d7ce2326ab69fc2c51277d378ea.tar
urpmi-74d16092cd6f0d7ce2326ab69fc2c51277d378ea.tar.gz
urpmi-74d16092cd6f0d7ce2326ab69fc2c51277d378ea.tar.bz2
urpmi-74d16092cd6f0d7ce2326ab69fc2c51277d378ea.tar.xz
urpmi-74d16092cd6f0d7ce2326ab69fc2c51277d378ea.zip
(_check) fix verifying packages signatures in chrooted environments
(especially important for installer where there's no rpmdb in / (really /var/lib/rpm) and thus no keys to check against)
-rw-r--r--NEWS5
-rw-r--r--urpm/signature.pm2
2 files changed, 6 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 9ed70043..6da9d8ef 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,8 @@
+- urpmi
+ o fix verifying packages signatures in chrooted environments (especially
+ important for installer where there's no rpmdb in / (really /var/lib/rpm)
+ and thus no keys to check against)
+
Version 6.22.2 - 4 March 2009
- close another fd leak (needed for drakx)
diff --git a/urpm/signature.pm b/urpm/signature.pm
index 882bbf35..473839d1 100644
--- a/urpm/signature.pm
+++ b/urpm/signature.pm
@@ -26,7 +26,7 @@ sub _check {
#- rpmlib is doing strftime %c, and so the string comes from the current encoding
#- (URPM::bind_rpm_textdomain_codeset() doesn't help here)
#- so we have to transform...
- my $verif = urpm::msg::from_locale_encoding(URPM::verify_signature($filepath));
+ my $verif = urpm::msg::from_locale_encoding(URPM::verify_signature($filepath, $urpm->{urpmi_root}));
if ($verif =~ /NOT OK/) {
$verif =~ s/\n//g;