Hello community,
here is the log from the commit of package libzypp-zmd-backend
checked in at Sat Apr 15 11:42:54 CEST 2006.
--------
--- libzypp-zmd-backend/libzypp-zmd-backend.changes 2006-04-13 16:17:59.000000000 +0200
+++ STABLE/libzypp-zmd-backend/libzypp-zmd-backend.changes 2006-04-14 16:52:07.000000000 +0200
@@ -1,0 +2,6 @@
+Fri Apr 14 16:51:35 CEST 2006 - visnov@suse.de
+
+- adapt KeyRing callbacks to new libzypp
+- rev 3097
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libzypp-zmd-backend.spec ++++++
--- /var/tmp/diff_new_pack.Ei3Jc3/_old 2006-04-15 11:42:38.000000000 +0200
+++ /var/tmp/diff_new_pack.Ei3Jc3/_new 2006-04-15 11:42:38.000000000 +0200
@@ -22,7 +22,7 @@
Obsoletes: zmd-librc-backend
Summary: ZMD backend for Package, Patch, Pattern, and Product Management
Version: 7.1.1.0
-Release: 11
+Release: 13
Source: zmd-backend-%{version}.tar.bz2
Prefix: /usr
@@ -68,6 +68,9 @@
/etc/logrotate.d/zmd-backend
%changelog -n libzypp-zmd-backend
+* Fri Apr 14 2006 - visnov@suse.de
+- adapt KeyRing callbacks to new libzypp
+- rev 3097
* Thu Apr 13 2006 - kkaempf@suse.de
- add KeyRing callbacks to transact and parse-metadata
- handle dry_run and nosignature on commit
++++++ zmd-backend-7.1.1.0.tar.bz2 ++++++
++++ 17075 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/zmd-backend-7.1.1.0/src/KeyRingCallbacks.h new/zmd-backend-7.1.1.0/src/KeyRingCallbacks.h
--- old/zmd-backend-7.1.1.0/src/KeyRingCallbacks.h 2006-04-13 12:45:28.000000000 +0200
+++ new/zmd-backend-7.1.1.0/src/KeyRingCallbacks.h 2006-04-14 14:10:47.000000000 +0200
@@ -19,6 +19,7 @@
#include
#include
#include
+#include
///////////////////////////////////////////////////////////////////
namespace zypp {
@@ -37,11 +38,19 @@
{ return true; }
virtual bool askUserToAcceptVerificationFailed( const Pathname &file, const std::string &keyid, const std::string &keyname )
{ return true; }
- virtual bool askUserToAcceptFileWithoutChecksum( const zypp::Pathname &file )
- { return true; }
};
+ struct DigestReceive : public zypp::callback::ReceiveReportzypp::DigestReport
+ {
+ virtual bool askUserToAcceptNoDigest( const zypp::Pathname &file )
+ { return true; }
+ virtual bool askUserToAccepUnknownDigest( const Pathname &file, const std::string &name )
+ { return true; }
+ virtual bool askUserToAcceptWrongDigest( const Pathname &file, const std::string &requested, const std::string &found )
+ { return true; }
+ };
+
///////////////////////////////////////////////////////////////////
}; // namespace zypp
///////////////////////////////////////////////////////////////////
@@ -64,4 +73,23 @@
};
+class DigestCallbacks {
+
+ private:
+ zypp::DigestReceive _digestReport;
+
+ public:
+ DigestCallbacks()
+ {
+ _digestReport.connect();
+ }
+
+ ~DigestCallbacks()
+ {
+ _digestReport.disconnect();
+ }
+
+};
+
+
#endif // ZMD_BACKEND_KEYRINGCALLBACKS_H
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/zmd-backend-7.1.1.0/src/transact.cc new/zmd-backend-7.1.1.0/src/transact.cc
--- old/zmd-backend-7.1.1.0/src/transact.cc 2006-04-13 16:04:44.000000000 +0200
+++ new/zmd-backend-7.1.1.0/src/transact.cc 2006-04-14 14:08:05.000000000 +0200
@@ -69,7 +69,7 @@
main (int argc, char **argv)
{
if (argc < 2) {
- cerr << "usage: " << argv[0] << " <database> [--test] [--nosignature]" << endl;
+ cerr << "usage: " << argv[0] << " <database> [--test] [--nosignature] [--nopretest]" << endl;
return 1;
}
@@ -77,10 +77,13 @@
bool dry_run = false;
bool nosignature = false;
+ bool nopretest = false;
while (argp < argc) {
string arg(argv[argp]);
if (arg == "--test") dry_run = true;
if (arg == "--nosignature") nosignature = true;
+#warning nopretest not honored
+ if (arg == "--nopretest") nopretest = true;
argp++;
}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...