[55139] trunk/base/src/macports1.0/macports.tcl

[jmr at macports.org]

Revision: 55139
          http://trac.macports.org/changeset/55139
Author:   jmr at macports.org
Date:     2009-08-06 19:35:02 -0700 (Thu, 06 Aug 2009)
Log Message:
-----------
don't fail on ports that are installed but not in the index in the pre-install upgrade attempt (#20591)

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

Modified: trunk/base/src/macports1.0/macports.tcl
===================================================================
--- trunk/base/src/macports1.0/macports.tcl	2009-08-07 02:09:18 UTC (rev 55138)
+++ trunk/base/src/macports1.0/macports.tcl	2009-08-07 02:35:02 UTC (rev 55139)
@@ -1533,7 +1533,8 @@
         set dep_portname [lindex [split $depspec :] end]
         if {![info exists depscache(port:$dep_portname)] && [registry::entry_exists_for_name $dep_portname]} {
             set status [macports::upgrade $dep_portname "port:$dep_portname" {} $variations $options depscache]
-            if {$status != 0 && ![macports::ui_isset ports_processall]} {
+            # status 2 means the port was not found in the index
+            if {$status != 0 && $status != 2 && ![macports::ui_isset ports_processall]} {
                 return -code error "upgrade $dep_portname failed"
             }
         }
@@ -2282,6 +2283,7 @@
 }
 
 # upgrade procedure
+# return codes: 0 = success, 1 = general failure, 2 = port name not found in index
 proc macports::upgrade {portname dspec globalvarlist variationslist optionslist {depscachename ""}} {
     global macports::registry.installtype
     global macports::portarchivemode
@@ -2312,8 +2314,8 @@
     }
     # argh! port doesnt exist!
     if {$result == ""} {
-        ui_error "No port $portname found."
-        return 1
+        ui_warn "No port $portname found in the index."
+        return 2
     }
     # fill array with information
     array set portinfo [lindex $result 1]
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090806/0fdc8a10/attachment.html>