<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch release-2.9
in repository macports-base.

</pre>
<p><a href="https://github.com/macports/macports-base/commit/6b43f1c67d0c97dfd58d2c25c52f122bbe99cd1b">https://github.com/macports/macports-base/commit/6b43f1c67d0c97dfd58d2c25c52f122bbe99cd1b</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/release-2.9 by this push:
<span style='display:block; white-space:pre;color:#404040;'>     new 6b43f1c67 test_archs: avoid failing on unreadable files
</span>6b43f1c67 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 6b43f1c67d0c97dfd58d2c25c52f122bbe99cd1b
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Wed Mar 13 05:46:57 2024 +1100

<span style='display:block; white-space:pre;color:#404040;'>    test_archs: avoid failing on unreadable files
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Fixes: https://trac.macports.org/ticket/69478
</span><span style='display:block; white-space:pre;color:#404040;'>    (cherry picked from commit e3468c5d60b9a5872d37b57c3d0e6a60694daac9)
</span>---
 src/port1.0/porttest.tcl | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/port1.0/porttest.tcl b/src/port1.0/porttest.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index a2e9e2c30..1a0e31ac4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/port1.0/porttest.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/port1.0/porttest.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -57,10 +57,21 @@ proc porttest::test_archs {} {
</span>     }
     array set file_archs {}
     set destrootlen [string length [option destroot]]
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    if {[getuid] == 0 && [geteuid] != 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        # file readable doesn't take euid into account
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        elevateToRoot test
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        set elevated 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>     fs-traverse -depth fullpath [list [option destpath]] {
         if {[file type $fullpath] ne "file"} {
             continue
         }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+        if {![file readable $fullpath]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            ui_debug "Skipping unreadable file: $fullpath"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            continue
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        }
</span>         if {[fileIsBinary $fullpath]} {
             set archs [get_file_archs $handle $fullpath]
             if {$archs ne ""} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -69,6 +80,11 @@ proc porttest::test_archs {} {
</span>             }
         }
     }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    if {[info exists elevated]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        dropPrivileges
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>     set wanted_archs [get_canonical_archs]
     set has_wanted_archs [info exists file_archs($wanted_archs)]
     unset -nocomplain file_archs($wanted_archs)
</pre><pre style='margin:0'>

</pre>