[82970] branches/gsoc11-rev-upgrade/base/src

[cal at macports.org]

Revision: 82970
          http://trac.macports.org/changeset/82970
Author:   cal at macports.org
Date:     2011-08-22 16:17:24 -0700 (Mon, 22 Aug 2011)
Log Message:
-----------
rev-upgrade: Move running rev-upgrade after upgrade to port.tcl rather
than macports::upgrade in macports.tcl so it gets run only once per call
of port upgrade.

Modified Paths:
--------------
    branches/gsoc11-rev-upgrade/base/src/macports1.0/macports.tcl
    branches/gsoc11-rev-upgrade/base/src/port/port.tcl

Modified: branches/gsoc11-rev-upgrade/base/src/macports1.0/macports.tcl
===================================================================
--- branches/gsoc11-rev-upgrade/base/src/macports1.0/macports.tcl	2011-08-22 21:38:49 UTC (rev 82969)
+++ branches/gsoc11-rev-upgrade/base/src/macports1.0/macports.tcl	2011-08-22 23:17:24 UTC (rev 82970)
@@ -3106,10 +3106,6 @@
         unset -nocomplain macports::global_options(ports_nodeps)
     }
 
-    array set options $optionslist
-    if {$status == 0 && ![global_option_isset ports_revupgrade] && ![info exists options(ports_upgrade_no-rev-upgrade)]} {
-        set status [macports::revupgrade]
-    }
     return $status
 }
 

Modified: branches/gsoc11-rev-upgrade/base/src/port/port.tcl
===================================================================
--- branches/gsoc11-rev-upgrade/base/src/port/port.tcl	2011-08-22 21:38:49 UTC (rev 82969)
+++ branches/gsoc11-rev-upgrade/base/src/port/port.tcl	2011-08-22 23:17:24 UTC (rev 82970)
@@ -2520,6 +2520,7 @@
     if {[require_portlist portlist] || ([prefix_unwritable] && ![macports::global_option_isset ports_dryrun])} {
         return 1
     }
+
     # shared depscache for all ports in the list
     array set depscache {}
     set status 0
@@ -2535,6 +2536,11 @@
     
     if {$status != 0} {
         print_tickets_url
+    } else {
+        array set options $opts
+        if {![info exists options(ports_upgrade_no-rev-upgrade)]} {
+            set status [action_revupgrade $action $portlist $opts]
+        }
     }
 
     return $status
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110822/3a9f3a6e/attachment.html>