summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2012-06-08 18:52:02 +0000
committerThierry Vignaud <tv@mageia.org>2012-06-08 18:52:02 +0000
commitd74b89cc3616de79b5a5301e26c5386df79a637e (patch)
tree047fcef419725000bce89f8666a0bf80fd9d5dc1
parentfcbfd1b42dad5092874b2d5c277839ad961e580a (diff)
downloadurpmi-d74b89cc3616de79b5a5301e26c5386df79a637e.tar
urpmi-d74b89cc3616de79b5a5301e26c5386df79a637e.tar.gz
urpmi-d74b89cc3616de79b5a5301e26c5386df79a637e.tar.bz2
urpmi-d74b89cc3616de79b5a5301e26c5386df79a637e.tar.xz
urpmi-d74b89cc3616de79b5a5301e26c5386df79a637e.zip
(_verify_rpm) let rpmdrake pass 'basename' option again
-rw-r--r--NEWS1
-rw-r--r--urpm/main_loop.pm3
2 files changed, 2 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index ee103fbd..0d96c62b 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,5 @@
- fix testsuite regressions
+- o make 'basename' option work again for rpmdrake
- urpmi:
o heavy refactorization
- urpmf:
diff --git a/urpm/main_loop.pm b/urpm/main_loop.pm
index e03e2976..8d27ab88 100644
--- a/urpm/main_loop.pm
+++ b/urpm/main_loop.pm
@@ -115,9 +115,8 @@ sub _download_all {
sub _verify_rpm {
my ($urpm, $callbacks, $transaction_sources_install, $transaction_sources) = @_;
$callbacks->{pre_check_sig} and $callbacks->{pre_check_sig}->();
- # CHECK ME: rpmdrake passed "basename => 1" option:
my @bad_signatures = urpm::signature::check($urpm, $transaction_sources_install, $transaction_sources,
- callback => $callbacks->{check_sig}
+ callback => $callbacks->{check_sig}, basename => $options{basename}
);
if (@bad_signatures) {