Changeset 82970

Timestamp:

08/22/11 16:17:24 (4 years ago)

Author:

cal@…

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.

Location:

branches/gsoc11-rev-upgrade/base/src

Files:

• macports1.0/macports.tcl (modified) (1 diff)
• port/port.tcl (modified) (2 diffs)

branches/gsoc11-rev-upgrade/base/src/macports1.0/macports.tcl

@@ -3107 +3107 @@
     }
 
-    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
 }

branches/gsoc11-rev-upgrade/base/src/port/port.tcl

@@ -2521 +2521 @@
         return 1
     }
+
     # shared depscache for all ports in the list
     array set depscache {}
@@ -2536 +2537 @@
     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]
+        }
     }