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

[jmr at macports.org]

Revision: 64625
          http://trac.macports.org/changeset/64625
Author:   jmr at macports.org
Date:     2010-03-11 04:49:27 -0800 (Thu, 11 Mar 2010)
Log Message:
-----------
'registry::entry imaged' actually means imaged or installed

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

Modified: trunk/base/src/registry2.0/portuninstall.tcl
===================================================================
--- trunk/base/src/registry2.0/portuninstall.tcl	2010-03-11 10:54:34 UTC (rev 64624)
+++ trunk/base/src/registry2.0/portuninstall.tcl	2010-03-11 12:49:27 UTC (rev 64625)
@@ -56,17 +56,12 @@
     set use_reg2 [string equal ${macports::registry.format} "receipt_sqlite"]
 
     if {$use_reg2} {
-        if {${macports::registry.installtype} == "image"} {
-	        set imaged_or_installed imaged
-	    } else {
-	        set imaged_or_installed installed
-	    }
         if { [registry::decode_spec $v version revision variants] } {
-            set ilist [registry::entry $imaged_or_installed $portname $version $revision $variants]
+            set ilist [registry::entry imaged $portname $version $revision $variants]
             set valid 1
         } else {
             set valid [string equal $v {}]
-            set ilist [registry::entry $imaged_or_installed $portname]
+            set ilist [registry::entry imaged $portname]
         }
     } else {
         set ilist [registry::installed $portname $v]

Modified: trunk/base/src/registry2.0/receipt_sqlite.tcl
===================================================================
--- trunk/base/src/registry2.0/receipt_sqlite.tcl	2010-03-11 10:54:34 UTC (rev 64624)
+++ trunk/base/src/registry2.0/receipt_sqlite.tcl	2010-03-11 12:49:27 UTC (rev 64625)
@@ -144,13 +144,9 @@
 # What we call version here is version_revision+variants.
 proc installed {{name ""} {version ""}} {
     global macports::registry.installtype
-	
+
 	if { $name == "" && $version == "" } {
-	    if {${macports::registry.installtype} == "image"} {
-	        set ports [registry::entry imaged]
-	    } else {
-	        set ports [registry::entry installed]
-	    }
+	    set ports [registry::entry imaged]
 	} else {
 	    set searchcmd "registry::entry search"
 	    registry::decode_spec $version version revision variants
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100311/bd74e4de/attachment.html>