Changeset 77681 for trunk/base

Timestamp:

Apr 9, 2011, 1:21:06 AM (13 years ago)

Author:

jmr@…

Message:

disable use of flat registry

Location:

trunk/base

Files:

• doc/macports.conf.in (modified) (1 diff)
• src/macports1.0/macports.tcl (modified) (1 diff)

trunk/base/doc/macports.conf.in

@@ -10 +10 @@
 # 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

trunk/base/src/macports1.0/macports.tcl

@@ -642 +642 @@
     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"
-        }
+    # 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 {
-        set registry.format receipt_sqlite
+        return -code error "unknown registry format '$portdbformat' set in macports.conf"
     }