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

[cal at macports.org]

Revision: 82969
          http://trac.macports.org/changeset/82969
Author:   cal at macports.org
Date:     2011-08-22 14:38:49 -0700 (Mon, 22 Aug 2011)
Log Message:
-----------
rev-upgrade: Be less noise, so debug output is actually useful

Modified Paths:
--------------
    branches/gsoc11-rev-upgrade/base/src/macports1.0/macports.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:21:25 UTC (rev 82968)
+++ branches/gsoc11-rev-upgrade/base/src/macports1.0/macports.tcl	2011-08-22 21:38:49 UTC (rev 82969)
@@ -3393,6 +3393,11 @@
                   || [_mportkey $workername "{os.major}"] != $os_major_installed)} {
             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} {
                 if {[llength $variationslist] > 0} {
@@ -3404,12 +3409,6 @@
                 ui_debug "No need to upgrade! $portname ${version_installed}_${revision_installed} >= $portname ${version_in_tree}_${revision_in_tree}"
             }
             set will_install no
-            if {$is_revupgrade} {
-                set will_install yes
-            }
-            if {$is_revupgrade_second_run} {
-                set build_override 1
-            }
         }
     }
 
@@ -3825,7 +3824,7 @@
 
         set i 1
         foreach b $binaries {
-            ui_debug "$i/[llength $binaries]: [$b path]"
+            #ui_debug "$i/[llength $binaries]: [$b path]"
             incr i
 
             set resultlist [machista::parse_file $handle [$b path]]
@@ -3835,7 +3834,8 @@
             if {$returncode != $machista::SUCCESS} {
                 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]"
                 }
@@ -4087,8 +4087,8 @@
         set is_broken_port false
 
         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
             lappend revadjlist([lindex $stack 0]) $dep
@@ -4100,7 +4100,7 @@
         }
         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]
         }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110822/576af4ab/attachment.html>