[48231] branches/release_1_7

[blb at macports.org]

Revision: 48231
          http://trac.macports.org/changeset/48231
Author:   blb at macports.org
Date:     2009-03-17 00:54:30 -0700 (Tue, 17 Mar 2009)
Log Message:
-----------
Merge r48230 from trunk: macports1.0/macports.tcl - use registry_installed
instead of registry_exists in _mportinstalled as the latter requires the
port's name, version, revision, and variants to succeed but the former only
the port's name; should fix ticket #17762;
Also remove unneeded res in _mportactive

Modified Paths:
--------------
    branches/release_1_7/base/src/macports1.0/macports.tcl

Property Changed:
----------------
    branches/release_1_7/
    branches/release_1_7/base/


Property changes on: branches/release_1_7
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk:42683,42697,42734,42747,42760,42845-42847,42865,42962,42978,43001,43080,43083,43097,43140,43153,43194,43216-43217,43229,43704-43705,43733,43946,43954,43960,44363,45161,45201,46146,46983,47034,47776,47782
/trunk/base:45161
   + /trunk:42683,42697,42734,42747,42760,42845-42847,42865,42962,42978,43001,43080,43083,43097,43140,43153,43194,43216-43217,43229,43704-43705,43733,43946,43954,43960,44363,45161,45201,46146,46983,47034,47776,47782,48230
/trunk/base:45161


Property changes on: branches/release_1_7/base
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/base:42683,42697,42734,42747,42760,42845-42847,42865,42962,42978,43001,43080,43083,43097,43140,43153,43194,43216-43217,43229,43704-43705,43733,43946,43954,43960,44363,45161,45201,46146,46622-46623,46810,46983,47034,47776,47782,47848
/trunk/base/base:45161
   + /trunk/base:42683,42697,42734,42747,42760,42845-42847,42865,42962,42978,43001,43080,43083,43097,43140,43153,43194,43216-43217,43229,43704-43705,43733,43946,43954,43960,44363,45161,45201,46146,46622-46623,46810,46983,47034,47776,47782,47848,48230
/trunk/base/base:45161

Modified: branches/release_1_7/base/src/macports1.0/macports.tcl
===================================================================
--- branches/release_1_7/base/src/macports1.0/macports.tcl	2009-03-17 07:51:05 UTC (rev 48230)
+++ branches/release_1_7/base/src/macports1.0/macports.tcl	2009-03-17 07:54:30 UTC (rev 48231)
@@ -1191,19 +1191,17 @@
 proc _mportinstalled {mport} {
     # Check for the presense of the port in the registry
     set workername [ditem_key $mport workername]
-    set res [$workername eval registry_exists \${portname} \${portversion}]
-    if {$res != 0} {
-        ui_debug "[ditem_key $mport provides] is installed"
-        return 1
-    } else {
+    if {[catch {set reslist [$workername eval registry_installed \${portname}]}]} {
         return 0
+    } else {
+        return [expr [llength $reslist] > 0]
     }
 }
 
 # Determine if a port is active (only for image mode)
 proc _mportactive {mport} {
     set workername [ditem_key $mport workername]
-    if {[catch {set reslist [$workername eval registry_active \${portname}]} res]} {
+    if {[catch {set reslist [$workername eval registry_active \${portname}]}]} {
         return 0
     } else {
         return [expr [llength $reslist] > 0]
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090317/c0701eca/attachment-0001.html>