[67594] branches/release_1_9/base/src/cregistry/entry.c

[jmr at macports.org]

Revision: 67594
          http://trac.macports.org/changeset/67594
Author:   jmr at macports.org
Date:     2010-05-13 12:28:27 -0700 (Thu, 13 May 2010)
Log Message:
-----------
merge r67593 from trunk:
 fix check for conflicting files in reg_entry_activate (#24880)

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

Modified Paths:
--------------
    branches/release_1_9/base/src/cregistry/entry.c

Modified: branches/release_1_9/base/src/cregistry/entry.c
===================================================================
--- branches/release_1_9/base/src/cregistry/entry.c	2010-05-13 19:25:23 UTC (rev 67593)
+++ branches/release_1_9/base/src/cregistry/entry.c	2010-05-13 19:28:27 UTC (rev 67594)
@@ -1060,7 +1060,7 @@
                 == SQLITE_OK)
                 && (sqlite3_bind_int64(update, 3, entry->id) == SQLITE_OK)) {
             for (i=0; i<file_count && result; i++) {
-                if ((sqlite3_bind_text(select, 1, files[i], -1, SQLITE_STATIC)
+                if ((sqlite3_bind_text(select, 1, as_files[i], -1, SQLITE_STATIC)
                             == SQLITE_OK)
                         && (sqlite3_bind_text(update, 1, as_files[i], -1,
                                 SQLITE_STATIC) == SQLITE_OK)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100513/aa53da4a/attachment.html>