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

[jmr at macports.org]

Revision: 66313
          http://trac.macports.org/changeset/66313
Author:   jmr at macports.org
Date:     2010-04-08 20:33:46 -0700 (Thu, 08 Apr 2010)
Log Message:
-----------
ignore upgrade failures due to obsolete ports everywhere

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

Modified: trunk/base/src/macports1.0/macports.tcl
===================================================================
--- trunk/base/src/macports1.0/macports.tcl	2010-04-09 03:27:56 UTC (rev 66312)
+++ trunk/base/src/macports1.0/macports.tcl	2010-04-09 03:33:46 UTC (rev 66313)
@@ -2738,7 +2738,7 @@
                 
                 # upgrade its dependencies first
                 set status [_upgrade_dependencies portinfo depscache variationslist options yes]
-                if {$status != 0 && ![ui_isset ports_processall]} {
+                if {$status != 0 && $status != 2 && ![ui_isset ports_processall]} {
                     catch {mportclose $workername}
                     return $status
                 }
@@ -2950,7 +2950,7 @@
     # first upgrade dependencies
     if {![info exists options(ports_nodeps)]} {
         set status [_upgrade_dependencies portinfo depscache variationslist options $will_build]
-        if {$status != 0 && ![ui_isset ports_processall]} {
+        if {$status != 0 && && $status != 2 ![ui_isset ports_processall]} {
             catch {mportclose $workername}
             return $status
         }
@@ -2976,7 +2976,7 @@
                     set mpname [lindex $dep 2]
                     if {![llength [array get depscache port:${mpname}]]} {
                         set status [macports::_upgrade $mpname port:${mpname} $variationslist [array get options] depscache]
-                        if {$status != 0 && ![ui_isset ports_processall]} {
+                        if {$status != 0 && $status != 2 && ![ui_isset ports_processall]} {
                             catch {mportclose $workername}
                             return $status
                         }
@@ -3095,7 +3095,7 @@
                 set mpname [lindex $dep 2]
                 if {![llength [array get depscache port:${mpname}]]} {
                     set status [macports::_upgrade $mpname port:${mpname} $variationslist [array get options] depscache]
-                    if {$status != 0 && ![ui_isset ports_processall]} {
+                    if {$status != 0 && $status != 2 && ![ui_isset ports_processall]} {
                         catch {mportclose $workername}
                         return $status
                     }
@@ -3177,11 +3177,11 @@
                         set d [lindex [split $i :] end]
                     }
                     set status [macports::_upgrade $d $dspec $variationslist [array get options] depscache]
-                    if {$status != 0 && ![ui_isset ports_processall]} break
+                    if {$status != 0 && $status != 2 && ![ui_isset ports_processall]} break
                 }
             }
         }
-        if {$status != 0 && ![ui_isset ports_processall]} break
+        if {$status != 0 && $status != 2 && ![ui_isset ports_processall]} break
     }
     # restore dependent-following to its former value
     if {$saved_do_dependents} {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100408/ec5f2e2a/attachment.html>