<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/52fa086d2b4817825b1ee37f2bc336186030da59">https://github.com/macports/macports-base/commit/52fa086d2b4817825b1ee37f2bc336186030da59</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 52fa086d2b4817825b1ee37f2bc336186030da59
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Wed Feb 15 02:08:22 2017 +1100
<span style='display:block; white-space:pre;color:#404040;'> Make port diagnose less verbose
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Print "Checking for ..." messages at info level. Don't print one for
</span><span style='display:block; white-space:pre;color:#404040;'> every installed port. Don't print anything for the X11.app on 10.6
</span><span style='display:block; white-space:pre;color:#404040;'> check when not on 10.6.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> (cherry picked from commit 741a77b7c453174e7df86a8bb9e5630ff914b842)
</span>---
src/macports1.0/diagnose.tcl | 30 ++++++++++--------------------
1 file changed, 10 insertions(+), 20 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 744456a..75360da 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;'>@@ -215,7 +215,7 @@ namespace eval diagnose {
</span> # None
if {!${diagnose::quiet}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_msg -nonewline "Checking for $string... "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_info -nonewline "Checking for $string... "
</span> }
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -232,11 +232,11 @@ namespace eval diagnose {
</span>
if {$result == 1} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_msg "\[SUCCESS\]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_info "\[SUCCESS\]"
</span> return
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_msg "\[FAILED\]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_info "\[FAILED\]"
</span> }
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -443,17 +443,11 @@ namespace eval diagnose {
</span> # Returns:
# None
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set apps [registry::entry imaged]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach app $apps {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set name [$app name]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- output "'${name} @[$app version]_[$app revision][$app variants]'s tarball on disk"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set ports [registry::entry imaged]
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![file exists [$app location]]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_warn "couldn't find the archive for '$name'. Please uninstall and reinstall this port."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- success_fail 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- success_fail 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach port $ports {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![file exists [$port location]]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_warn "couldn't find the archive for '[$port name] @[$port version]_[$port revision][$port variants]'. Please uninstall and reinstall this port."
</span> }
}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -504,11 +498,8 @@ namespace eval diagnose {
</span> # Returns:
# None
<span style='display:block; white-space:pre;background:#ffe0e0;'>- output "X11.app on OS X 10.6 systems"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set mac_version ${macports::macosx_version}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {$mac_version eq "10.6"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${macports::macosx_version} eq "10.6"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ output "X11.app on OS X 10.6 systems"
</span>
if {[file exists /Applications/X11.app]} {
ui_error "it seems you have Mac OS X 10.6 installed, and are using X11 from \"X11.app\". This has been known to cause issues. \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -518,9 +509,8 @@ namespace eval diagnose {
</span> success_fail 0
return
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ success_fail 1
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- success_fail 1
</span> }
proc check_free_space {} {
</pre><pre style='margin:0'>
</pre>