[77681] trunk/base

[jmr at macports.org]

Revision: 77681
          http://trac.macports.org/changeset/77681
Author:   jmr at macports.org
Date:     2011-04-08 18:21:06 -0700 (Fri, 08 Apr 2011)
Log Message:
-----------
disable use of flat registry

Modified Paths:
--------------
    trunk/base/doc/macports.conf.in
    trunk/base/src/macports1.0/macports.tcl

Modified: trunk/base/doc/macports.conf.in
===================================================================
--- trunk/base/doc/macports.conf.in	2011-04-09 00:59:44 UTC (rev 77680)
+++ trunk/base/doc/macports.conf.in	2011-04-09 01:21:06 UTC (rev 77681)
@@ -10,10 +10,6 @@
 # Where to store MacPorts working data
 portdbpath		@localstatedir_expanded@/macports
 
-# Type of storage to use for the port registry information, "flat" or "sqlite"
-# default is sqlite, flat is legacy
-#portdbformat		sqlite
-
 # PATH settings that are used for external tools (configure, make, etc.) while installing ports. The default
 # paths are given in the example; it need not be uncommented.  Customizing binpath is intended for advanced users only.
 #binpath		@prefix_expanded@/bin:@prefix_expanded@/sbin:/bin:/sbin:/usr/bin:/usr/sbin

Modified: trunk/base/src/macports1.0/macports.tcl
===================================================================
--- trunk/base/src/macports1.0/macports.tcl	2011-04-09 00:59:44 UTC (rev 77680)
+++ trunk/base/src/macports1.0/macports.tcl	2011-04-09 01:21:06 UTC (rev 77681)
@@ -641,15 +641,12 @@
 
     set registry.path $portdbpath
 
-    # Format for receipts, can currently be either "flat" or "sqlite"
-    if {[info exists portdbformat]} {
-        if {$portdbformat == "flat" || $portdbformat == "sqlite"} {
-            set registry.format receipt_${portdbformat}
-        } else {
-            return -code error "unknown registry format '$portdbformat' set in macports.conf"
-        }
-    } else {
+    # Format for receipts; currently only "sqlite" is allowed
+    # could previously be "flat", so we switch that to sqlite
+    if {![info exists portdbformat] || $portdbformat == "flat" || $portdbformat == "sqlite"} {
         set registry.format receipt_sqlite
+    } else {
+        return -code error "unknown registry format '$portdbformat' set in macports.conf"
     }
 
     # Autoclean mode, whether to automatically call clean after "install"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110408/9da63187/attachment-0001.html>