<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/3e1f15d4b8289330dfaa98b99c642fa38cd4015a">https://github.com/macports/macports-base/commit/3e1f15d4b8289330dfaa98b99c642fa38cd4015a</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 3e1f15d4b8289330dfaa98b99c642fa38cd4015a
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Wed Feb 15 02:35:38 2017 +1100

<span style='display:block; white-space:pre;color:#404040;'>    Port diagnose file check fix
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Don't report failure before checking whether a port's apparently
</span><span style='display:block; white-space:pre;color:#404040;'>    missing file is actually a link.
</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/53490
</span><span style='display:block; white-space:pre;color:#404040;'>    (cherry picked from commit 103d6f6d4e102f4df84608b43a0dd4a8f8d6613c)
</span>---
 src/macports1.0/diagnose.tcl | 7 ++-----
 1 file changed, 2 insertions(+), 5 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 75360da..8a1fa61 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;'>@@ -401,16 +401,13 @@ namespace eval diagnose {
</span>                         output "file '$file' on disk"
                     }
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    if {![file exists $file]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    if {[catch {file type $file}]} {
</span>                         if {$fancyOutput} {
                             $progress intermission
                         } else {
                             success_fail 0
                         }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        if {[catch {file lstat $file _}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            ui_warn "couldn't find file '$file' for port '$name'. Please deactivate and reactivate the port to fix this issue."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        ui_warn "couldn't find file '$file' for port '$name'. Please deactivate and reactivate the port to fix this issue."
</span>                     } elseif {![file readable $file]} {
                         if {$fancyOutput} {
                             $progress intermission
</pre><pre style='margin:0'>

</pre>