Mailinglist Archive: opensuse-commit (159 mails)

[root@xxxxxxx (h_root)]

Hello community,

here is the log from the commit of package libzypp-zmd-backend
checked in at Fri Mar 31 15:41:43 CEST 2006.

--------
--- libzypp-zmd-backend/libzypp-zmd-backend.changes	2006-03-30 15:02:23.000000000 +0200
+++ libzypp-zmd-backend/libzypp-zmd-backend.changes	2006-03-30 22:06:44.000000000 +0200
@@ -1,0 +2,7 @@
+Thu Mar 30 22:05:08 CEST 2006 - kkaempf@xxxxxxx
+
+- fix 'update-status', the 'status' attribute was moved to the
+  resolvables table
+- rev 2815
+
+-------------------------------------------------------------------

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ libzypp-zmd-backend.spec ++++++
--- /var/tmp/diff_new_pack.b9Nlo2/_old	2006-03-31 15:41:01.000000000 +0200
+++ /var/tmp/diff_new_pack.b9Nlo2/_new	2006-03-31 15:41:01.000000000 +0200
@@ -22,7 +22,7 @@
 Obsoletes:      zmd-librc-backend
 Summary:        ZMD backend for Package, Patch, Pattern, and Product Management
 Version:        7.1.1
-Release:        25
+Release:        26
 Source:         zmd-backend-%{version}.tar.bz2
 Prefix:         /usr
 
@@ -69,6 +69,10 @@
 
 %changelog -n libzypp-zmd-backend
 * Thu Mar 30 2006 - kkaempf@xxxxxxx
+- fix 'update-status', the 'status' attribute was moved to the
+  resolvables table
+- rev 2815
+* Thu Mar 30 2006 - kkaempf@xxxxxxx
 - let the target fill the pool.
 - rev 2792.
 * Thu Mar 30 2006 - kkaempf@xxxxxxx

++++++ zmd-backend-7.1.1.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-backend-7.1.1/src/dbsource/DbSourceImpl.cc new/zmd-backend-7.1.1/src/dbsource/DbSourceImpl.cc
--- old/zmd-backend-7.1.1/src/dbsource/DbSourceImpl.cc	2006-03-19 20:33:26.000000000 +0100
+++ new/zmd-backend-7.1.1/src/dbsource/DbSourceImpl.cc	2006-03-30 19:17:58.000000000 +0200
@@ -564,6 +564,8 @@
 	break;
 	case RC_DEP_TARGET_SRC:		kind = ResTraits<SrcPackage>::kind;
 	break;
+	case RC_DEP_TARGET_SYSTEM:	kind = ResTraits<SystemResObject>::kind;
+	break;
 	default:			WAR << "Unknown dep_target " << dep_target << endl;
 					kind = ResTraits<Package>::kind;
 	break;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-backend-7.1.1/src/transact.cc new/zmd-backend-7.1.1/src/transact.cc
--- old/zmd-backend-7.1.1/src/transact.cc	2006-03-29 14:51:01.000000000 +0200
+++ new/zmd-backend-7.1.1/src/transact.cc	2006-03-30 18:50:32.000000000 +0200
@@ -66,11 +66,16 @@
 int
 main (int argc, char **argv)
 {
-    if (argc != 2) {
-	cerr << "usage: " << argv[0] << " <database>" << endl;
+    if (argc < 2) {
+	cerr << "usage: " << argv[0] << " <database> [dry-run]" << endl;
 	return 1;
     }
 
+    bool dry_run = false;
+    if (argc > 2) {
+	dry_run = (string(argv[2]) == "dry-run");
+    }
+
     const char *logfile = getenv("ZYPP_LOGFILE");
     if (logfile != NULL)
 	zypp::base::LogControl::instance().logfile( logfile );
@@ -130,7 +135,7 @@
 
 	::setenv( "YAST_IS_RUNNING", "1", 1 );
 
-	God->target()->commit( God->pool(), 0, x, y, z );
+	God->target()->commit( God->pool(), 0, x, y, z, dry_run );
 
 	ExternalProgram suseconfig( "/sbin/SuSEconfig", ExternalProgram::Discard_Stderr );	// should redirect stderr to logfile
 	suseconfig.close();		// discard exit code
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-backend-7.1.1/src/update-status.cc new/zmd-backend-7.1.1/src/update-status.cc
--- old/zmd-backend-7.1.1/src/update-status.cc	2006-03-28 22:25:38.000000000 +0200
+++ new/zmd-backend-7.1.1/src/update-status.cc	2006-03-30 22:01:51.000000000 +0200
@@ -84,14 +84,11 @@
 
     sqlite3_stmt *handle = NULL;
 
-    const char *sql = "UPDATE patch_details SET status = ? WHERE resolvable_id = ?";
-
-// USE THIS once 'status' is available as an attribute of the 'resolvables' table
-//    const char *sql = "UPDATE resolvables SET status = ? WHERE id = ?";
+    const char *sql = "UPDATE resolvables SET status = ? WHERE id = ?";
 
     int rc = sqlite3_prepare( db, sql, -1, &handle, NULL );
     if (rc != SQLITE_OK) {
-	ERR << "Can not prepare transaction insertion clause: " << sqlite3_errmsg (db) << endl;
+	ERR << "Can not prepare update resolvables clause: " << sqlite3_errmsg (db) << endl;
         return false;
     }
 


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...