[88888] trunk/base/src/cregistry/sql.c

[cal at macports.org]

Revision: 88888
          http://trac.macports.org/changeset/88888
Author:   cal at macports.org
Date:     2012-01-14 07:40:09 -0800 (Sat, 14 Jan 2012)
Log Message:
-----------
update_db: Fix for the test failure introduced by r88885

Revision Links:
--------------
    http://trac.macports.org/changeset/88885

Modified Paths:
--------------
    trunk/base/src/cregistry/sql.c

Modified: trunk/base/src/cregistry/sql.c
===================================================================
--- trunk/base/src/cregistry/sql.c	2012-01-14 15:34:37 UTC (rev 88887)
+++ trunk/base/src/cregistry/sql.c	2012-01-14 15:40:09 UTC (rev 88888)
@@ -296,13 +296,11 @@
          */
 
         /* if we arrive here, no update was done and we should end the
-         * transaction. Since no change was done, we can either ROLLBACK or
-         * COMMIT. Note that ROLLBACK will fail, if we do not finalize the
-         * current stmt!
-         */
+         * transaction. Using ROLLBACK here causes problems when rolling back
+         * other transactions later in the program. */
         sqlite3_finalize(stmt);
         stmt = NULL;
-        rollback_db(db);
+        r = sqlite3_exec(db, "COMMIT", NULL, NULL, NULL);
     } while (did_update);
 
     sqlite3_finalize(stmt);
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120114/09403505/attachment.html>