[67596] branches/release_1_9/base/src/registry2.0/receipt_sqlite.tcl

[jmr at macports.org]

Revision: 67596
          http://trac.macports.org/changeset/67596
Author:   jmr at macports.org
Date:     2010-05-13 12:52:49 -0700 (Thu, 13 May 2010)
Log Message:
-----------
merge r67595 from trunk:
 avoid registry conversion failure when filemap and contents don't correspond properly

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

Modified Paths:
--------------
    branches/release_1_9/base/src/registry2.0/receipt_sqlite.tcl

Property Changed:
----------------
    branches/release_1_9/base/src/registry2.0/receipt_sqlite.tcl

Modified: branches/release_1_9/base/src/registry2.0/receipt_sqlite.tcl
===================================================================
--- branches/release_1_9/base/src/registry2.0/receipt_sqlite.tcl	2010-05-13 19:50:24 UTC (rev 67595)
+++ branches/release_1_9/base/src/registry2.0/receipt_sqlite.tcl	2010-05-13 19:52:49 UTC (rev 67596)
@@ -266,7 +266,19 @@
         if {$props(installtype) == "image"} {
             $regref map $props(imagefiles)
             if {$props(state) == "installed"} {
-                $regref activate $props(imagefiles) $props(files)
+                if {[llength $props(imagefiles)] != [llength $props(files)]} {
+                    # deal with this mess, just drop the extras...
+                    set i 0
+                    set ilist {}; set flist {}
+                    while {$i < [llength $props(imagefiles)] && $i < [llength $props(files)]} {
+                        lappend ilist [lindex $props(imagefiles) $i]
+                        lappend flist [lindex $props(files) $i]
+                        incr i
+                    }
+                    $regref activate $ilist $flist
+                } else {
+                    $regref activate $props(imagefiles) $props(files)
+                }
             }
         } else {
             $regref map $props(files)


Property changes on: branches/release_1_9/base/src/registry2.0/receipt_sqlite.tcl
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/gsoc08-privileges/base/src/registry1.0/receipt_sqlite.tcl:37343-46937
/branches/gsoc09-logging/base/src/registry1.0/receipt_sqlite.tcl:51231-60371
/branches/universal-sanity/base/src/registry1.0/receipt_sqlite.tcl:51872-52323
/branches/variant-descs-14482/base/src/registry1.0/receipt_sqlite.tcl:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/trunk/base/src/registry2.0/receipt_sqlite.tcl:67304-67305,67307,67384
/users/perry/base-bugs_and_notes/src/registry1.0/receipt_sqlite.tcl:45682-46060
/users/perry/base-select/src/registry1.0/receipt_sqlite.tcl:44044-44692
   + /branches/gsoc08-privileges/base/src/registry1.0/receipt_sqlite.tcl:37343-46937
/branches/gsoc09-logging/base/src/registry1.0/receipt_sqlite.tcl:51231-60371
/branches/universal-sanity/base/src/registry1.0/receipt_sqlite.tcl:51872-52323
/branches/variant-descs-14482/base/src/registry1.0/receipt_sqlite.tcl:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/trunk/base/src/registry2.0/receipt_sqlite.tcl:67304-67305,67307,67384,67449,67451,67487,67593,67595
/users/perry/base-bugs_and_notes/src/registry1.0/receipt_sqlite.tcl:45682-46060
/users/perry/base-select/src/registry1.0/receipt_sqlite.tcl:44044-44692
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100513/b0703e45/attachment.html>