[118600] branches/release_2_3/base

[cal at macports.org]

Revision: 118600
          https://trac.macports.org/changeset/118600
Author:   cal at macports.org
Date:     2014-04-05 11:25:07 -0700 (Sat, 05 Apr 2014)
Log Message:
-----------
merge r118598 and r118599 from trunk: fix non-root trace mode

Revision Links:
--------------
    https://trac.macports.org/changeset/118598
    https://trac.macports.org/changeset/118599

Modified Paths:
--------------
    branches/release_2_3/base/src/port1.0/porttrace.tcl
    branches/release_2_3/base/tests/test/trace/test.tcl

Property Changed:
----------------
    branches/release_2_3/base/


Property changes on: branches/release_2_3/base
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/gsoc08-privileges/base:37343-46937
/branches/gsoc09-logging/base:51231-60371
/branches/gsoc11-rev-upgrade/base:78828-88375
/branches/gsoc11-statistics/base:79520,79666
/branches/gsoc13-tests:106692-111324
/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:118038-118039,118056
/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/gsoc11-statistics/base:79520,79666
/branches/gsoc13-tests:106692-111324
/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:118038-118039,118056,118598-118599
/users/perry/base-bugs_and_notes:45682-46060
/users/perry/base-select:44044-44692

Modified: branches/release_2_3/base/src/port1.0/porttrace.tcl
===================================================================
--- branches/release_2_3/base/src/port1.0/porttrace.tcl	2014-04-05 18:23:15 UTC (rev 118599)
+++ branches/release_2_3/base/src/port1.0/porttrace.tcl	2014-04-05 18:25:07 UTC (rev 118600)
@@ -49,9 +49,7 @@
             # Create a fifo.
             # path in unix socket limited to 109 chars
             # # set trace_fifo "$workpath/trace_fifo"
-            set trace_fifo "/tmp/macports/[pid]_[expr {int(rand()*1000)}]"
-            file mkdir "/tmp/macports"
-            chownAsRoot "/tmp/macports"
+            set trace_fifo "/tmp/macports_trace_[pid]-[expr {int(rand()*1000)}]"
             file delete -force $trace_fifo
 
             # Create the thread/process.
@@ -337,7 +335,7 @@
 # Private.
 # Slave cleanup method.
 proc porttrace::slave_stop {} {
-    global trace_filemap trace_fifo_r_chan trace_fifo_w_chan
+    global trace_filemap
     # Close the virtual filemap.
     filemap close trace_filemap
     # Close the pipe (both ends).

Modified: branches/release_2_3/base/tests/test/trace/test.tcl
===================================================================
--- branches/release_2_3/base/tests/test/trace/test.tcl	2014-04-05 18:23:15 UTC (rev 118599)
+++ branches/release_2_3/base/tests/test/trace/test.tcl	2014-04-05 18:25:07 UTC (rev 118600)
@@ -26,7 +26,6 @@
     exec sudo -u $user touch ../tracetesttmp/rename-trace
     exec sudo -u $user mkdir ../tracetesttmp/rmdir-trace
     file delete -force /tmp/hello-trace
-    file attributes /usr/include/unistd.h -owner $user
     file link -symbolic /tmp/link-trace2 /usr/include/unistd.h
     exec chown -h $user /tmp/link-trace2
 
@@ -46,8 +45,6 @@
 
 test trace {
     Regression test for trace.
-} -constraints {
-    root
 } -body {
     test_trace
 } -result "No errors found."
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140405/f5339cda/attachment.html>