[47035] branches/release_1_7

[blb at macports.org]

Revision: 47035
          http://trac.macports.org/changeset/47035
Author:   blb at macports.org
Date:     2009-02-19 23:54:35 -0800 (Thu, 19 Feb 2009)
Log Message:
-----------
Merge r47034 from trunk: macports1.0/macports.tcl - trim whitespace from
option values when setting so errant whitespace at the end of the line
doesn't muck things up; ticket #18460

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

Property Changed:
----------------
    branches/release_1_7/
    branches/release_1_7/base/


Property changes on: branches/release_1_7
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk:42683,42697,42734,42747,42760,42845-42847,42865,42962,42978,43001,43080,43083,43097,43140,43153,43194,43216-43217,43229,43704-43705,43733,43946,43954,43960,44363,45161,45201,46146
/trunk/base:45161
   + /trunk:42683,42697,42734,42747,42760,42845-42847,42865,42962,42978,43001,43080,43083,43097,43140,43153,43194,43216-43217,43229,43704-43705,43733,43946,43954,43960,44363,45161,45201,46146,47034
/trunk/base:45161


Property changes on: branches/release_1_7/base
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/base:42683,42697,42734,42747,42760,42845-42847,42865,42962,42978,43001,43080,43083,43097,43140,43153,43194,43216-43217,43229,43704-43705,43733,43946,43954,43960,44363,45161,45201,46146,46622-46623
/trunk/base/base:45161
   + /trunk/base:42683,42697,42734,42747,42760,42845-42847,42865,42962,42978,43001,43080,43083,43097,43140,43153,43194,43216-43217,43229,43704-43705,43733,43946,43954,43960,44363,45161,45201,46146,46622-46623,47034
/trunk/base/base:45161

Modified: branches/release_1_7/base/src/macports1.0/macports.tcl
===================================================================
--- branches/release_1_7/base/src/macports1.0/macports.tcl	2009-02-20 07:52:17 UTC (rev 47034)
+++ branches/release_1_7/base/src/macports1.0/macports.tcl	2009-02-20 07:54:35 UTC (rev 47035)
@@ -387,7 +387,7 @@
             while {[gets $fd line] >= 0} {
                 if {[regexp {^(\w+)([ \t]+(.*))?$} $line match option ignore val] == 1} {
                     if {[lsearch $bootstrap_options $option] >= 0} {
-                        set macports::$option $val
+                        set macports::$option [string trim $val]
                         global macports::$option
                     }
                 }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090219/e9bc159e/attachment.html>