Hello community,
here is the log from the commit of package libzypp-zmd-backend
checked in at Thu Apr 13 17:33:58 CEST 2006.
--------
--- libzypp-zmd-backend/libzypp-zmd-backend.changes 2006-04-12 17:28:10.000000000 +0200
+++ STABLE/libzypp-zmd-backend/libzypp-zmd-backend.changes 2006-04-13 16:17:59.000000000 +0200
@@ -1,0 +2,8 @@
+Thu Apr 13 16:06:36 CEST 2006 - kkaempf@suse.de
+
+- add KeyRing callbacks to transact and parse-metadata
+- handle dry_run and nosignature on commit
+- dont fail on dry_run (#164583)
+- rev 3092
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libzypp-zmd-backend.spec ++++++
--- /var/tmp/diff_new_pack.QlPrDt/_old 2006-04-13 17:33:50.000000000 +0200
+++ /var/tmp/diff_new_pack.QlPrDt/_new 2006-04-13 17:33:50.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: 10
+Release: 11
Source: zmd-backend-%{version}.tar.bz2
Prefix: /usr
@@ -68,6 +68,11 @@
/etc/logrotate.d/zmd-backend
%changelog -n libzypp-zmd-backend
+* Thu Apr 13 2006 - kkaempf@suse.de
+- add KeyRing callbacks to transact and parse-metadata
+- handle dry_run and nosignature on commit
+- dont fail on dry_run (#164583)
+- rev 3092
* Wed Apr 12 2006 - kkaempf@suse.de
- write all atoms to support multi-arch patch deps (#165556)
- rev 3077
++++++ zmd-backend-7.1.1.0.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore 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 1970-01-01 01:00:00.000000000 +0100
+++ new/zmd-backend-7.1.1.0/src/KeyRingCallbacks.h 2006-04-13 12:45:28.000000000 +0200
@@ -0,0 +1,67 @@
+/*---------------------------------------------------------------------\
+| ____ _ __ __ ___ |
+| |__ / \ / / . \ . \ |
+| / / \ V /| _/ _/ |
+| / /__ | | | | | | |
+| /_____||_| |_| |_| |
+| |
+\---------------------------------------------------------------------*/
+/** \file zmd/backend/KeyRingCallbacks.cc
+ *
+*/
+
+#ifndef ZMD_BACKEND_KEYRINGCALLBACKS_H
+#define ZMD_BACKEND_KEYRINGCALLBACKS_H
+
+#include <iostream>
+
+#include
+#include
+#include
+#include
+
+///////////////////////////////////////////////////////////////////
+namespace zypp {
+///////////////////////////////////////////////////////////////////
+
+ ///////////////////////////////////////////////////////////////////
+ // KeyRingReceive
+ ///////////////////////////////////////////////////////////////////
+ struct KeyRingReceive : public zypp::callback::ReceiveReportzypp::KeyRingReport
+ {
+ virtual bool askUserToAcceptUnsignedFile( const Pathname &file )
+ { return true; }
+ virtual bool askUserToAcceptUnknownKey( const Pathname &file, const std::string &keyid, const std::string &keyname )
+ { return true; }
+ virtual bool askUserToTrustKey( const std::string &keyid, const std::string &keyname, const std::string &keydetails )
+ { 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; }
+ };
+
+
+///////////////////////////////////////////////////////////////////
+}; // namespace zypp
+///////////////////////////////////////////////////////////////////
+
+class KeyRingCallbacks {
+
+ private:
+ zypp::KeyRingReceive _keyRingReport;
+
+ public:
+ KeyRingCallbacks()
+ {
+ _keyRingReport.connect();
+ }
+
+ ~KeyRingCallbacks()
+ {
+ _keyRingReport.disconnect();
+ }
+
+};
+
+#endif // ZMD_BACKEND_KEYRINGCALLBACKS_H
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-backend-7.1.1.0/src/Makefile.am new/zmd-backend-7.1.1.0/src/Makefile.am
--- old/zmd-backend-7.1.1.0/src/Makefile.am 2006-04-10 16:54:54.000000000 +0200
+++ new/zmd-backend-7.1.1.0/src/Makefile.am 2006-04-13 12:46:25.000000000 +0200
@@ -30,8 +30,8 @@
query_system_SOURCES = query-system.cc zmd-backend.cc
query_files_SOURCES = query-files.cc zmd-backend.cc
resolve_dependencies_SOURCES = resolve-dependencies.cc transactions.cc transactions.h zmd-backend.cc
-transact_SOURCES = transact.cc transactions.cc transactions.h RpmCallbacks.h MediaChangeCallback.h MessageResolvableReportCallback.h zmd-backend.cc
-parse_metadata_SOURCES = parse-metadata.cc zmd-backend.cc
+transact_SOURCES = transact.cc transactions.cc transactions.h RpmCallbacks.h MediaChangeCallback.h MessageResolvableReportCallback.h KeyRingCallbacks.h zmd-backend.cc
+parse_metadata_SOURCES = parse-metadata.cc zmd-backend.cc KeyRingCallbacks.h
package_files_SOURCES = package-files.cc zmd-backend.cc
find_file_SOURCES = find-file.cc zmd-backend.cc
update_status_SOURCES = update-status.cc zmd-backend.cc
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-backend-7.1.1.0/src/Makefile.in new/zmd-backend-7.1.1.0/src/Makefile.in
--- old/zmd-backend-7.1.1.0/src/Makefile.in 2006-04-10 16:55:02.000000000 +0200
+++ new/zmd-backend-7.1.1.0/src/Makefile.in 2006-04-13 12:46:34.000000000 +0200
@@ -312,8 +312,8 @@
query_system_SOURCES = query-system.cc zmd-backend.cc
query_files_SOURCES = query-files.cc zmd-backend.cc
resolve_dependencies_SOURCES = resolve-dependencies.cc transactions.cc transactions.h zmd-backend.cc
-transact_SOURCES = transact.cc transactions.cc transactions.h RpmCallbacks.h MediaChangeCallback.h MessageResolvableReportCallback.h zmd-backend.cc
-parse_metadata_SOURCES = parse-metadata.cc zmd-backend.cc
+transact_SOURCES = transact.cc transactions.cc transactions.h RpmCallbacks.h MediaChangeCallback.h MessageResolvableReportCallback.h KeyRingCallbacks.h zmd-backend.cc
+parse_metadata_SOURCES = parse-metadata.cc zmd-backend.cc KeyRingCallbacks.h
package_files_SOURCES = package-files.cc zmd-backend.cc
find_file_SOURCES = find-file.cc zmd-backend.cc
update_status_SOURCES = update-status.cc zmd-backend.cc
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-backend-7.1.1.0/src/parse-metadata.cc new/zmd-backend-7.1.1.0/src/parse-metadata.cc
--- old/zmd-backend-7.1.1.0/src/parse-metadata.cc 2006-04-12 16:18:22.000000000 +0200
+++ new/zmd-backend-7.1.1.0/src/parse-metadata.cc 2006-04-13 12:45:58.000000000 +0200
@@ -46,6 +46,7 @@
#include
#include "dbsource/DbAccess.h"
+#include "KeyRingCallbacks.h"
//----------------------------------------------------------------------------
static SourceManager_Ptr manager;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore 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-10 16:54:27.000000000 +0200
+++ new/zmd-backend-7.1.1.0/src/transact.cc 2006-04-13 16:04:44.000000000 +0200
@@ -28,6 +28,7 @@
#include "RpmCallbacks.h"
#include "MediaChangeCallback.h"
#include "MessageResolvableReportCallback.h"
+#include "KeyRingCallbacks.h"
using solver::detail::ResolverInfo_Ptr;
@@ -142,13 +143,21 @@
PoolItemList x,y,z;
::setenv( "YAST_IS_RUNNING", "1", 1 );
-#warning Must honor nosignature
-#if 0
-#warning dry_run disabled
- God->target()->commit( God->pool(), 0, x, y, z );
-#else
- God->target()->commit( God->pool(), 0, x, y, z, dry_run );
-#endif
+
+ ZYppCommitPolicy policy;
+ if (dry_run) policy.dryRun( true );
+ if (nosignature) policy.rpmNoSignature( true );
+
+ ZYppCommitResult zres = God->commit( policy );
+ if (zres._result != 0) {
+ result = 1;
+ if (zres._errors.size() > 0) {
+ cout << "3|Incomplete transactions:" << endl;
+ for (PoolItemList::const_iterator it = zres._errors.begin(); it != zres._errors.end(); ++it) {
+ cout << "3|" << it->resolvable() << endl;
+ }
+ }
+ }
ExternalProgram suseconfig( "/sbin/SuSEconfig", ExternalProgram::Discard_Stderr ); // should redirect stderr to logfile
suseconfig.close(); // discard exit code
}
@@ -178,5 +187,10 @@
MIL << "END transact, result " << result << endl;
+ if (count > 1
+ && dry_run)
+ {
+ return 0; // bug #164583
+ }
return result;
}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...