[27523] trunk/base/src

[source_changes at macosforge.org]

Revision: 27523
          http://trac.macosforge.org/projects/macports/changeset/27523
Author:   sfiera at macports.org
Date:     2007-08-06 13:12:49 -0700 (Mon, 06 Aug 2007)

Log Message:
-----------
Add keys 'default_variants', 'installtype'; de-unique file path

Modified Paths:
--------------
    trunk/base/src/cregistry/entry.c
    trunk/base/src/cregistry/sql.c
    trunk/base/src/registry2.0/entryobj.c

Modified: trunk/base/src/cregistry/entry.c
===================================================================
--- trunk/base/src/cregistry/entry.c	2007-08-06 20:12:44 UTC (rev 27522)
+++ trunk/base/src/cregistry/entry.c	2007-08-06 20:12:49 UTC (rev 27523)
@@ -554,20 +554,10 @@
                     case SQLITE_DONE:
                         sqlite3_reset(stmt);
                         continue;
-                    case SQLITE_ERROR:
-                        switch (sqlite3_reset(stmt)) {
-                            case SQLITE_CONSTRAINT:
-                                errPtr->code = "registry::already-owned";
-                                errPtr->description = "mapped file is already "
-                                    "owned by another entry";
-                                errPtr->free = NULL;
-                                sqlite3_finalize(stmt);
-                                return i;
-                            default:
-                                reg_sqlite_error(db, errPtr, query);
-                                sqlite3_finalize(stmt);
-                                return i;
-                        }
+                    default:
+                        reg_sqlite_error(db, errPtr, query);
+                        sqlite3_finalize(stmt);
+                        return i;
                 }
             } else {
                 reg_sqlite_error(db, errPtr, query);

Modified: trunk/base/src/cregistry/sql.c
===================================================================
--- trunk/base/src/cregistry/sql.c	2007-08-06 20:12:44 UTC (rev 27522)
+++ trunk/base/src/cregistry/sql.c	2007-08-06 20:12:49 UTC (rev 27523)
@@ -242,7 +242,8 @@
         "CREATE TABLE registry.ports ("
             "id INTEGER PRIMARY KEY AUTOINCREMENT,"
             "name, portfile, url, location, epoch, version COLLATE VERSION, "
-            "revision COLLATE VERSION, variants, state, date, "
+            "revision COLLATE VERSION, variants, default_variants, state, "
+            "date, installtype, "
             "UNIQUE (name, epoch, version, revision, variants), "
             "UNIQUE (url, epoch, version, revision, variants)"
             ")",
@@ -253,7 +254,7 @@
         "CREATE INDEX registry.port_state ON ports (state)",
 
         /* file map */
-        "CREATE TABLE registry.files (id, path UNIQUE, mtime)",
+        "CREATE TABLE registry.files (id, path, mtime)",
         "CREATE INDEX registry.file_port ON files (id)",
 
         "END",

Modified: trunk/base/src/registry2.0/entryobj.c
===================================================================
--- trunk/base/src/registry2.0/entryobj.c	2007-08-06 20:12:44 UTC (rev 27522)
+++ trunk/base/src/registry2.0/entryobj.c	2007-08-06 20:12:49 UTC (rev 27523)
@@ -48,8 +48,10 @@
     "version",
     "revision",
     "variants",
+    "default_variants",
     "date",
     "state",
+    "installtype",
     NULL
 };
 
@@ -192,8 +194,10 @@
     { "version", entry_obj_prop },
     { "revision", entry_obj_prop },
     { "variants", entry_obj_prop },
+    { "default_variants", entry_obj_prop },
     { "date", entry_obj_prop },
     { "state", entry_obj_prop },
+    { "installtype", entry_obj_prop },
     { "map", entry_obj_map },
     { "unmap", entry_obj_unmap },
     { "files", entry_obj_files },

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070806/2793bdf9/attachment.html