[126892] branches/release_2_3/base

cal at macports.org cal at macports.org
Thu Oct 16 15:12:04 PDT 2014


Revision: 126892
          https://trac.macports.org/changeset/126892
Author:   cal at macports.org
Date:     2014-10-16 15:12:04 -0700 (Thu, 16 Oct 2014)
Log Message:
-----------
merge r124150 from trunk: trace mode: report existing files separately, decrease verboseness for non-existent files, improve output formatting

 It makes sense to backports this change together with r124146 to avoid huge
 amounts of useless output warning about /usr/local (when the referenced file
 doesn't even exist).

Revision Links:
--------------
    https://trac.macports.org/changeset/124150
    https://trac.macports.org/changeset/124146

Modified Paths:
--------------
    branches/release_2_3/base/src/port1.0/porttrace.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,118085,118161,118559,118562-118569,118598-118599,118602-118603,118606-118607,118640,118735,119034,119169,119171,119175,119204,119297,119987,119992,120036,120038,120059-120060,120064,120067-120069,120074,120076,120127,120132,120142,120345,120382,120637,121311,121364,121451,121485,123652,124145-124146,125578,125621,125859,126866,126868
/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,118085,118161,118559,118562-118569,118598-118599,118602-118603,118606-118607,118640,118735,119034,119169,119171,119175,119204,119297,119987,119992,120036,120038,120059-120060,120064,120067-120069,120074,120076,120127,120132,120142,120345,120382,120637,121311,121364,121451,121485,123652,124145-124146,124150,125578,125621,125859,126866,126868
/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-10-16 22:08:35 UTC (rev 126891)
+++ branches/release_2_3/base/src/port1.0/porttrace.tcl	2014-10-16 22:12:04 UTC (rev 126892)
@@ -231,9 +231,39 @@
     # Get the list of violations.
     set violations [slave_send porttrace::slave_get_sandbox_violations]
 
+    set existingFiles [list]
+    set missingFiles  [list]
     foreach violation [lsort -unique $violations] {
-        ui_warn "An activity was attempted outside sandbox: $violation"
+        if {![catch {file lstat $violation _}]} {
+            lappend existingFiles $violation
+        } else {
+            lappend missingFiles $violation
+        }
     }
+
+    set existingFilesLen [llength $existingFiles]
+    if {$existingFilesLen > 0} {
+        if {$existingFilesLen > 1} {
+            ui_warn "The following existing files were hidden from the build system by trace mode:"
+        } else {
+            ui_warn "The following existing file was hidden from the build system by trace mode:"
+        }
+        foreach violation $existingFiles {
+            ui_msg "  $violation"
+        }
+    }
+
+    set missingFilesLen [llength $missingFiles]
+    if {$missingFilesLen > 0} {
+        if {$missingFilesLen > 1} {
+            ui_info "The following files would have been hidden from the build system by trace mode if they existed:"
+        } else {
+            ui_info "The following file would have been hidden from the build system by trace mode if it existed:"
+        }
+        foreach violation $missingFiles {
+            ui_info "  $violation"
+        }
+    }
 }
 
 # Stop the trace and return the list of ports the port depends on.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20141016/082bf7ce/attachment.html>


More information about the macports-changes mailing list