<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch release-2.4
in repository macports-base.
</pre>
<p><a href="https://github.com/macports/macports-base/commit/435dae3bd47dfd1ce35491326c84978bb9d759bf">https://github.com/macports/macports-base/commit/435dae3bd47dfd1ce35491326c84978bb9d759bf</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 435dae3bd47dfd1ce35491326c84978bb9d759bf
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Wed Feb 15 02:42:18 2017 +1100
<span style='display:block; white-space:pre;color:#404040;'> Don't check file readability in port diagnose
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Not all files installed by ports should be readable.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> (cherry picked from commit 738b2132efa18271e87811f4cd28e7ed2e2e8a04)
</span>---
src/macports1.0/diagnose.tcl | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/macports1.0/diagnose.tcl b/src/macports1.0/diagnose.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 8a1fa61..2aea94f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/macports1.0/diagnose.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/macports1.0/diagnose.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -408,17 +408,13 @@ namespace eval diagnose {
</span> success_fail 0
}
ui_warn "couldn't find file '$file' for port '$name'. Please deactivate and reactivate the port to fix this issue."
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } elseif {![file readable $file]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {$fancyOutput} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $progress intermission
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- success_fail 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_warn "'$file' installed by port '$name' is currently not readable. Please try again. If this problem persists, please contact the mailing list."
</span> } elseif {!$fancyOutput} {
success_fail 1
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # TODO: check permissions against those in the port image.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Can't just check for readability because some files
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # (and/or their parent directories) should not be readable
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # by normal users for various reasons.
</span>
incr currentFile
}
</pre><pre style='margin:0'>
</pre>