[112420] branches/release_2_2

[jmr at macports.org]

Revision: 112420
          https://trac.macports.org/changeset/112420
Author:   jmr at macports.org
Date:     2013-10-22 06:32:52 -0700 (Tue, 22 Oct 2013)
Log Message:
-----------
merge r111641 from trunk:
 silliness--

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

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

Property Changed:
----------------
    branches/release_2_2/
    branches/release_2_2/base/


Property changes on: branches/release_2_2
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk:107106,107465,107527,107674,107753,108406,109869,110985,111254,111377
   + /trunk:107106,107465,107527,107674,107753,108406,109869,110985,111254,111377,111641


Property changes on: branches/release_2_2/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:106802,106807,106809-106810,107106,107465,107527,107674,107753,108406,109869,110985,111254,111377
/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:106802,106807,106809-106810,107106,107465,107527,107674,107753,108406,109869,110985,111254,111377,111641
/users/perry/base-bugs_and_notes:45682-46060
/users/perry/base-select:44044-44692

Modified: branches/release_2_2/base/src/macports1.0/macports.tcl
===================================================================
--- branches/release_2_2/base/src/macports1.0/macports.tcl	2013-10-22 13:29:42 UTC (rev 112419)
+++ branches/release_2_2/base/src/macports1.0/macports.tcl	2013-10-22 13:32:52 UTC (rev 112420)
@@ -596,7 +596,7 @@
     set macosx_version {}
     if {$os_platform == "darwin"} {
         # This will probably break when Apple changes versioning
-        set macosx_version [expr 10.0 + ($os_major - 4) / 10.0]
+        set macosx_version 10.[expr {$os_major - 4}]
     }
 
     # Ensure that the macports user directory (i.e. ~/.macports) exists if HOME is defined.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20131022/4cda099a/attachment.html>