[64587] trunk/base/src/registry2.0

[jmr at macports.org]

Revision: 64587
          http://trac.macports.org/changeset/64587
Author:   jmr at macports.org
Date:     2010-03-09 22:13:51 -0800 (Tue, 09 Mar 2010)
Log Message:
-----------
handle new props in registry::convert_to_sqlite

Modified Paths:
--------------
    trunk/base/src/registry2.0/receipt_sqlite.tcl
    trunk/base/src/registry2.0/registry.tcl

Modified: trunk/base/src/registry2.0/receipt_sqlite.tcl
===================================================================
--- trunk/base/src/registry2.0/receipt_sqlite.tcl	2010-03-10 02:54:03 UTC (rev 64586)
+++ trunk/base/src/registry2.0/receipt_sqlite.tcl	2010-03-10 06:13:51 UTC (rev 64587)
@@ -205,6 +205,7 @@
     registry::write {
         set regref [registry::entry create $props(name) $props(version) $props(revision) $props(variants) $props(epoch)]
         $regref date $props(date)
+        $regref requested $props(requested)
         $regref location $props(location)
         $regref state $props(state)
         $regref installtype $props(installtype)
@@ -216,6 +217,13 @@
         } else {
             $regref map $props(files)
         }
+        foreach key {negated_variants os_platform os_major archs} {
+            if {$props($key) != 0} {
+                $regref $key $props($key)
+            } else {
+                $regref $key ""
+            }
+        }
         foreach dep_portname $props(depends) {
             $regref depends $dep_portname
         }

Modified: trunk/base/src/registry2.0/registry.tcl
===================================================================
--- trunk/base/src/registry2.0/registry.tcl	2010-03-10 02:54:03 UTC (rev 64586)
+++ trunk/base/src/registry2.0/registry.tcl	2010-03-10 06:13:51 UTC (rev 64587)
@@ -401,10 +401,15 @@
         set proplist [list name $iname version $iversion revision $irevision variants $ivariants]
 
         set iref [receipt_flat::open_entry $iname $iversion $irevision $ivariants]
-        
+
         lappend proplist date [receipt_flat::property_retrieve $iref date]
         lappend proplist epoch [receipt_flat::property_retrieve $iref epoch]
-        
+        lappend proplist negated_variants [receipt_flat::property_retrieve $iref negated_variants]
+        lappend proplist requested [receipt_flat::property_retrieve $iref requested]
+        lappend proplist os_platform [receipt_flat::property_retrieve $iref os_platform]
+        lappend proplist os_major [receipt_flat::property_retrieve $iref os_major]
+        lappend proplist archs [receipt_flat::property_retrieve $iref archs]
+
         set installtype [receipt_flat::property_retrieve $iref installtype]
         lappend proplist installtype $installtype
         if { $installtype == "image" } {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100309/4e227daa/attachment.html>