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

[cal at macports.org]

Revision: 79637
          http://trac.macports.org/changeset/79637
Author:   cal at macports.org
Date:     2011-06-21 15:41:46 -0700 (Tue, 21 Jun 2011)
Log Message:
-----------
rev-upgrade: Fixed a few typos, removed code I only guessed to be correct but doesn't seem to be

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-06-21 22:33:34 UTC (rev 79636)
+++ branches/gsoc11-rev-upgrade/base/src/macports1.0/macports.tcl	2011-06-21 22:41:46 UTC (rev 79637)
@@ -3563,8 +3563,7 @@
                 switch $arch {
                     x86_64 {}
                     i386 {}
-                    ppc {}
-                    ppc64 {}
+                    # todo: what are the correct string reported by otool -arch all -L for the PPC archs?
                     default {
                         ui_warn "Unknown architecture $arch"
                     }
@@ -3577,7 +3576,7 @@
             }
             if {1 == [regexp -nocase {^\t([^\s]+) \(compatibility version ([^,]+), current version ([^)]+)\)} $otool_line match file comp_version curr_version]} {
                 if {$file == [$b path]} {
-                    # This is a self-referencing entry
+                    # library files contain themselves as their first entry in the output of otool -L
                     continue;
                 }
                 ui_debug "Linked against: $file, architecture $arch, version $curr_version, compatibility version $comp_version"
@@ -3590,7 +3589,7 @@
                                 set lib_found true
                                 if {$curr_version != $lib_curr_version} {
                                     if {$comp_version != $lib_comp_version} {
-                                        ui_warn "Incompatibly library version: Expected $comp_version, but got $lib_comp_version!"
+                                        ui_warn "Incompatible library version of $file: Expected $comp_version, but $lib_comp_version is installed!"
                                     }
                                 }
                             }
@@ -3602,7 +3601,7 @@
                 }
                 continue;
             }
-            ui_warn "unparseable line in otool output: $otool_line"
+            ui_warn "Unparsable line in otool output: $otool_line"
         }
     }
     return 0;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110621/1a8eee89/attachment.html>