[58094] branches/release_1_8/base

[blb at macports.org]

Revision: 58094
          http://trac.macports.org/changeset/58094
Author:   blb at macports.org
Date:     2009-09-21 21:15:43 -0700 (Mon, 21 Sep 2009)
Log Message:
-----------
Merge r58093 from trunk:
port1.0/portinstall.tcl - fix attribute-setting issue for non-root installs on 10.6; see thread at
<http://lists.macosforge.org/pipermail/macports-users/2009-August/016346.html>

Revision Links:
--------------
    http://trac.macports.org/changeset/58093

Modified Paths:
--------------
    branches/release_1_8/base/src/port1.0/portinstall.tcl

Property Changed:
----------------
    branches/release_1_8/base/


Property changes on: branches/release_1_8/base
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/gsoc08-privileges/base:37343-46937
/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:55268,55279,55281,55285,55317,55385,55417,55591,55594,55679,55767,55793,55825,56147,56160,56162,56435,56448,56472-56474,56666,56889,57026,57048,57055,57131,57255,57784,57801,57820,57871,57974,57979,57982
/users/perry/base-bugs_and_notes:45682-46060
/users/perry/base-select:44044-44692
   + /branches/gsoc08-privileges/base:37343-46937
/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:55268,55279,55281,55285,55317,55385,55417,55591,55594,55679,55767,55793,55825,56147,56160,56162,56435,56448,56472-56474,56666,56889,57026,57048,57055,57131,57255,57784,57801,57820,57871,57974,57979,57982,58093
/users/perry/base-bugs_and_notes:45682-46060
/users/perry/base-select:44044-44692

Modified: branches/release_1_8/base/src/port1.0/portinstall.tcl
===================================================================
--- branches/release_1_8/base/src/port1.0/portinstall.tcl	2009-09-22 04:14:28 UTC (rev 58093)
+++ branches/release_1_8/base/src/port1.0/portinstall.tcl	2009-09-22 04:15:43 UTC (rev 58094)
@@ -78,7 +78,15 @@
     
     # if the file is a symlink, do not try to set file attributes
     if {[file type $src_element] != "link"} {
-        eval file attributes {$dst_element} [file attributes $src_element]
+        # tclsh on 10.6 doesn't like the combination of 0444 perm and
+        # '-creator {}' (which is returned from 'file attributes <file>'; so
+        # instead just set the attributes which are needed
+        set wantedattrs {owner group permissions}
+        set file_attr_cmd {file attributes $dst_element}
+        foreach oneattr $wantedattrs {
+            set file_attr_cmd "$file_attr_cmd -$oneattr \[file attributes \$src_element -$oneattr\]"
+        }
+        eval $file_attr_cmd
         # set mtime on installed element
         file mtime $dst_element [file mtime $src_element]
     }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090921/ad64e101/attachment.html>