Mailinglist Archive: zypp-commit (171 mails)

< Previous Next >
[zypp-commit] <libzypp-testsuite> master : Fixed changed keyring callbacks.
  • From: Ján Kupec <jkupec@xxxxxxx>
  • Date: Tue, 9 Jun 2009 13:47:41 +0200
  • Message-id: <E1MDzpW-0001o4-Cb@xxxxxxxxxxxxxxxx>
ref: refs/heads/master
commit 98443d680b76f429c36039d8d3e27634e4889d73
Author: Ján Kupec <jkupec@xxxxxxx>
Date: Tue Jun 9 13:47:41 2009 +0200

Fixed changed keyring callbacks.
---
solver/src/KeyRingCallbacks.h | 23 +++++++++++++++++------
1 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/solver/src/KeyRingCallbacks.h b/solver/src/KeyRingCallbacks.h
index 7df7479..14219ba 100644
--- a/solver/src/KeyRingCallbacks.h
+++ b/solver/src/KeyRingCallbacks.h
@@ -30,14 +30,21 @@ namespace zypp {
///////////////////////////////////////////////////////////////////
struct KeyRingReceive : public
zypp::callback::ReceiveReport<zypp::KeyRingReport>
{
- virtual bool askUserToAcceptUnsignedFile( const std::string &file )
+ virtual bool askUserToAcceptUnsignedFile( const std::string &file,
const KeyContext & context )
{
- XXX << "(" << file << ")" << std::endl;
+ XXX << "("
+ << file << ", "
+ << (context.empty() ? "<unknown>" : context.repoInfo().alias())
+ << ")" << std::endl;
return true;
}
- virtual bool askUserToAcceptUnknownKey( const std::string &file, const
std::string &id )
+ virtual bool askUserToAcceptUnknownKey( const std::string &file,
+ const std::string &id,
+ const zypp::KeyContext &
context )
{
- XXX << "(" << file << ", " << id << ")" << std::endl;
+ XXX << "(" << file << ", " << id << ", "
+ << (context.empty() ? "<unknown>" : context.repoInfo().alias())
+ << ")" << std::endl;
return true;
}
virtual bool askUserToImportKey( const PublicKey &key )
@@ -49,9 +56,13 @@ namespace zypp {
XXX << "(" << key << ")" << std::endl;
return true;
}
- virtual bool askUserToAcceptVerificationFailed( const std::string
&file, const PublicKey &key )
+ virtual bool askUserToAcceptVerificationFailed( const std::string &file,
+ const PublicKey &key,
+ const zypp::KeyContext
& context)
{
- XXX << "(" << file << ", " << key << ")" << std::endl;
+ XXX << "(" << file << ", " << key << ", "
+ << (context.empty() ? "<unknown>" : context.repoInfo().alias())
+ << ")" << std::endl;
return true;
}
};
--
To unsubscribe, e-mail: zypp-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: zypp-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread
  • No further messages