Changeset 81289

Timestamp:

07/28/11 19:18:25 (4 years ago)

Author:

cal@…

Message:

rev-upgrade: Implement rebuilding as if one had called port -fn upgrade $broken_port_name

File:

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

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

@@ -3752 +3752 @@
     array set broken_port_counts {}
     while {$run_loop == 1} {
-        if {[catch {revupgrade_scanandrebuild broken_port_counts} run_loop] == 1} {
-            ui_error "An error occured while scanning for broken ports and/or trying to rebuild them"
-            error "An error occured while scanning for broken ports and/or trying to rebuild them"
-        }
+        set run_loop [revupgrade_scanandrebuild broken_port_counts]
     }
     return 0;
@@ -3931 +3928 @@
         }
 
+        # shared depscache for all ports that are going to be rebuilt
+        array set depscache {}
+        set status 0
+        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]} {
+                    error "Error rebuilding [$port name]"
+                }
+
+            }
+        }
+
         return 1;
     }