Changeset 81668

Timestamp:

08/03/11 13:33:17 (4 years ago)

Author:

cal@…

Message:

rev-upgrade: Rebuild ports using own options rather than specifying force and nodepends

File:

• branches/gsoc11-rev-upgrade/base/src/macports1.0/macports.tcl (modified) (4 diffs)

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

@@ -3114 +3114 @@
     }
 
+    # Is this a rev-upgrade-called run?
+    set is_revupgrade no
+    if {[macports::global_option_isset ports_revupgrade]} {
+        set is_revupgrade yes
+    }
+    set is_revupgrade_second_run no
+    if {[macports::global_option_isset ports_revupgrade_second_run]} {
+        set is_revupgrade_second_run yes
+    }
+
     # check if the port is in tree
     if {[catch {mportlookup $portname} result]} {
@@ -3379 +3389 @@
             }
             set will_install no
+            if {$is_revupgrade} {
+                set will_install yes
+            }
+            if {$is_revupgrade_second_run} {
+                set build_override 1
+            }
         }
     }
@@ -3384 +3400 @@
     set will_build no
     # avoid building again unnecessarily
-    if {$will_install && ([info exists options(ports_upgrade_force)] || $build_override == 1
-        || ![registry::entry_exists $newname $version_in_tree $revision_in_tree $portinfo(canonical_active_variants)])} {
+    if {$will_install &&
+        ([info exists options(ports_upgrade_force)]
+            || $build_override == 1
+            || ![registry::entry_exists $newname $version_in_tree $revision_in_tree $portinfo(canonical_active_variants)])} {
         set will_build yes
     }
 
     # first upgrade dependencies
-    if {![info exists options(ports_nodeps)]} {
+    if {![info exists options(ports_nodeps)] && !$is_revupgrade} {
         set status [_upgrade_dependencies portinfo depscache variationslist options $will_build]
         if {$status != 0 && $status != 2 && ![ui_isset ports_processall]} {
@@ -3933 +3951 @@
         foreach port $topsort_ports {
             if {![info exists depscache(port:[$port name])]} {
-                array set variations {}
-                
-                set strindex 0
-                set variantsstr "[$port variants][$port negated_variants]"
-                while {$strindex != [string length $variantsstr]} {
-                        set type [string index $variantsstr $strindex]
-                        if {$type != "+" && $type != "-"} {
-                            # ignore char not starting a variant definition
-                            incr $strindex
-                            continue
-                        }
-
-                        set endpidx [string first "+" $variantsstr $strindex+1]
-                        set endmidx [string first "-" $variantsstr $strindex+1]
-                        set endidx [expr $endpidx < $endmidx ? $endpidx : $endmidx]
-
-                        if {$endidx != -1} {
-                            set variantname [string trim [string range $variantsstr $strindex+1 $endidx]]
-                            set strindex $endidx
-                        } else {
-                            # end of string
-                            set variantname [string trim [string range $variantsstr $strindex+1 end]]
-                            set strindex [string length $variantsstr]
-                        }
-
-                        set variations($variantname) $type
-                }
-
-                # make macports::upgrade behave like calling port -f -n upgrade [$port name]
-                set status [macports::upgrade [$port name] "port:[$port name]" [array get variations] {ports_upgrade_force yes ports_nodeps yes} depscache]
-                if {$status != 0 && ![macports::ui_isset ports_processall]} {
+
+                # convert variations into the format macports::upgrade needs
+                set minusvariant [lrange [split [$port negated_variants] "-"] 1 end]
+                set plusvariant  [lrange [split [$port variants]         "+"] 1 end]
+                set variants     [list]
+                foreach v $minusvariant {
+                    lappend variants $v "-"
+                }
+                foreach v $plusvariant {
+                    lappend variants $v "+"
+                }
+                array set variations $variants
+
+                set macports::global_options(ports_revupgrade) "yes"
+                unset -nocomplain macports::global_options(ports_revupgrade_second_run)
+                if {$broken_port_counts([$port name]) > 1} {
+                    set macports::global_options(ports_revupgrade_second_run) yes
+                }
+
+                # call macports::upgrade with ports_revupgrade option to rebuild the port
+                set status [macports::upgrade [$port name] "port:[$port name]" \
+                    [array get variations] [array get macports::global_options] depscache]
+                if {$status != 0} {
                     error "Error rebuilding [$port name]"
                 }
-
             }
         }