[64631] trunk/base/src/registry2.0/receipt_sqlite.tcl

[jmr at macports.org]

Revision: 64631
          http://trac.macports.org/changeset/64631
Author:   jmr at macports.org
Date:     2010-03-11 07:33:39 -0800 (Thu, 11 Mar 2010)
Log Message:
-----------
handle empty variant strings correctly in receipt_sqlite

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

Modified: trunk/base/src/registry2.0/receipt_sqlite.tcl
===================================================================
--- trunk/base/src/registry2.0/receipt_sqlite.tcl	2010-03-11 15:17:16 UTC (rev 64630)
+++ trunk/base/src/registry2.0/receipt_sqlite.tcl	2010-03-11 15:33:39 UTC (rev 64631)
@@ -147,15 +147,22 @@
 
 	if { $name == "" && $version == "" } {
 	    set ports [registry::entry imaged]
+	} elseif { $name != "" && $version == ""} {
+	    set ports [registry::entry imaged $name]
 	} else {
-	    set searchcmd "registry::entry search"
+	    set cmd "registry::entry imaged $name"
 	    registry::decode_spec $version version revision variants
-	    foreach key {name version revision variants} {
-            if {[info exists $key] && [set $key] != ""} {
-                append searchcmd " $key {[set $key]}"
-            }
-	    }
-	    if {[catch {set ports [eval $searchcmd]}]} {
+	    if {[info exists version] && $version != ""} {
+                append cmd " $version"
+                if {[info exists revision] && $revision != ""} {
+                    append cmd " $revision"
+                    if {![info exists variants]} {
+                        set variants ""
+                    }
+                    append cmd " {$variants}"
+                }
+        }
+	    if {[catch {set ports [eval $cmd]}]} {
 	        set ports [list]
 	    }
 	}
@@ -177,11 +184,10 @@
 proc list_dependents {name version revision variants} {
 	set rlist [list]
 	set searchcmd "registry::entry search"
-    foreach key {name version revision variants} {
-        if {[set $key] != ""} {
-            append searchcmd " $key [set $key]"
-        }
+    foreach key {name version revision} {
+        append searchcmd " $key [set $key]"
     }
+    append searchcmd " variants {$variants}"
     if {[catch {set ports [eval $searchcmd]}]} {
         set ports [list]
     }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100311/a19be994/attachment-0001.html>