Changeset 82969

Timestamp:

08/22/11 14:38:49 (4 years ago)

Author:

cal@…

Message:

rev-upgrade: Be less noise, so debug output is actually useful

File:

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

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

@@ -3394 +3394 @@
             ui_debug "platform mismatch ... upgrading!"
             set build_override 1
+        } elseif {$is_revupgrade_second_run} {
+            set build_override 1
+        } elseif {$is_revupgrade} {
+            # in the first run of rev-upgrade, only activate possibly already existing files and check for missing dependencies
+            set will_install yes
         } else {
             if {[info exists portinfo(canonical_active_variants)] && $portinfo(canonical_active_variants) != $oldvariant} {
@@ -3405 +3410 @@
             }
             set will_install no
-            if {$is_revupgrade} {
-                set will_install yes
-            }
-            if {$is_revupgrade_second_run} {
-                set build_override 1
-            }
         }
     }
@@ -3826 +3825 @@
         set i 1
         foreach b $binaries {
-            ui_debug "$i/[llength $binaries]: [$b path]"
+            #ui_debug "$i/[llength $binaries]: [$b path]"
             incr i
 
@@ -3836 +3835 @@
                 if {$returncode == $machista::EMAGIC} {
                     # not a Mach-O file
-                    ui_debug "Error parsing file [$b path]: [machista::strerror $returncode]"
+                    # ignore silently, these are only static libs anyway
+                    #ui_debug "Error parsing file [$b path]: [machista::strerror $returncode]"
                 } else {
                     ui_warn "Error parsing file [$b path]: [machista::strerror $returncode]"
@@ -4088 +4088 @@
 
         if {[info exists adjlist($dep)]} {
-            ui_debug "Dependency [$dep name] is broken, adding edge from [[lindex $stack 0] name] to [$dep name]"
-            ui_debug "Making [$dep name] new head of stack"
+            #ui_debug "Dependency [$dep name] is broken, adding edge from [[lindex $stack 0] name] to [$dep name]"
+            #ui_debug "Making [$dep name] new head of stack"
             # $dep is one of the broken ports
             # add an edge to the last broken port in the DFS
@@ -4101 +4101 @@
         revupgrade_buildgraph $dep stack adjlist revadjlist visited
         if {$is_broken_port} {
-            ui_debug "Removing [$dep name] from stack"
+            #ui_debug "Removing [$dep name] from stack"
             # remove $dep from the stack
             set stack [lrange $stack 1 end]