[95612] branches/release_2_1

[jmr at macports.org]

Revision: 95612
          https://trac.macports.org/changeset/95612
Author:   jmr at macports.org
Date:     2012-07-17 17:22:08 -0700 (Tue, 17 Jul 2012)
Log Message:
-----------
merge r93816 from trunk:
 rev-upgrade: Change wording on error message to match dyld's, print formatted compatibility_version numbers rather than raw numbers.

Revision Links:
--------------
    https://trac.macports.org/changeset/93816

Modified Paths:
--------------
    branches/release_2_1/base/src/macports1.0/macports.tcl

Property Changed:
----------------
    branches/release_2_1/
    branches/release_2_1/base/
    branches/release_2_1/base/src/macports1.0/


Property changes on: branches/release_2_1
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk:91825,91829,91834,92072,92342,92404,92546,92730,92785,92881,92903,92976,93062,93153,93197,93250,93258-93259,93261,93268,93274,93303,93339,93511-93512
   + /trunk:91825,91829,91834,92072,92342,92404,92546,92730,92785,92881,92903,92976,93062,93153,93197,93250,93258-93259,93261,93268,93274,93303,93339,93511-93512,93816


Property changes on: branches/release_2_1/base
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/gsoc08-privileges/base:37343-46937
/branches/gsoc09-logging/base:51231-60371
/branches/gsoc11-rev-upgrade/base:78828-88375
/branches/universal-sanity/base:51872-52323
/branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/trunk/base:91825,91829,91834,92072,92342,92404,92546,92730,92785,92881,92903,92976,93062,93129,93153,93197,93250,93256,93258-93259,93261,93268,93274,93303,93339,93511-93512
/users/perry/base-bugs_and_notes:45682-46060
/users/perry/base-select:44044-44692
   + /branches/gsoc08-privileges/base:37343-46937
/branches/gsoc09-logging/base:51231-60371
/branches/gsoc11-rev-upgrade/base:78828-88375
/branches/universal-sanity/base:51872-52323
/branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/trunk/base:91825,91829,91834,92072,92342,92404,92546,92730,92785,92881,92903,92976,93062,93129,93153,93197,93250,93256,93258-93259,93261,93268,93274,93303,93339,93511-93512,93816
/users/perry/base-bugs_and_notes:45682-46060
/users/perry/base-select:44044-44692


Property changes on: branches/release_2_1/base/src/macports1.0
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/gsoc08-privileges/base/src/macports1.0:37343-46937
/branches/gsoc09-logging/base/src/macports1.0:51231-60371
/branches/gsoc11-rev-upgrade/base/src/macports1.0:78828-88375
/branches/universal-sanity/base/src/macports1.0:51872-52323
/branches/variant-descs-14482/base/src/macports1.0:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/trunk/base/src/macports1.0:91825,91829,91834,92072,92342,92404,92546,92730,92785,92881,92903,92976,93062,93129,93153,93197,93221
/users/perry/base-bugs_and_notes/src/macports1.0:45682-46060
/users/perry/base-select/src/macports1.0:44044-44692
   + /branches/gsoc08-privileges/base/src/macports1.0:37343-46937
/branches/gsoc09-logging/base/src/macports1.0:51231-60371
/branches/gsoc11-rev-upgrade/base/src/macports1.0:78828-88375
/branches/universal-sanity/base/src/macports1.0:51872-52323
/branches/variant-descs-14482/base/src/macports1.0:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/trunk/base/src/macports1.0:91825,91829,91834,92072,92342,92404,92546,92730,92785,92881,92903,92976,93062,93129,93153,93197,93221,93816
/users/perry/base-bugs_and_notes/src/macports1.0:45682-46060
/users/perry/base-select/src/macports1.0:44044-44692

Modified: branches/release_2_1/base/src/macports1.0/macports.tcl
===================================================================
--- branches/release_2_1/base/src/macports1.0/macports.tcl	2012-07-18 00:20:05 UTC (rev 95611)
+++ branches/release_2_1/base/src/macports1.0/macports.tcl	2012-07-18 00:22:08 UTC (rev 95612)
@@ -4282,7 +4282,7 @@
                             if {[macports::ui_isset ports_verbose]} {
                                 ui_msg ""
                             }
-                            ui_info "Incompatible library version of file [$loadcommand cget -mlt_install_name]: Expected [$loadcommand cget -mlt_comp_version], but got [$libarchitecture cget -mat_comp_version]"
+                            ui_info "Incompatible library version: $bpath requires version [machista::format_dylib_version [$loadcommand cget -mlt_comp_version]] or later, but $filepath provides version [machista::format_dylib_version [$libarchitecture cget -mat_comp_version]]"
                             ui_debug "Marking $bpath as broken"
                             lappend broken_files $bpath
                         }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120717/d306d103/attachment.html>