<pre style='margin:0'>
Clemens Lang (neverpanic) pushed a commit to branch master
in repository macports-base.
</pre>
<p><a href="https://github.com/macports/macports-base/commit/b78e320b12ef44dc8acfa6b0b2c8eee247fd693e">https://github.com/macports/macports-base/commit/b78e320b12ef44dc8acfa6b0b2c8eee247fd693e</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit b78e320b12ef44dc8acfa6b0b2c8eee247fd693e
</span>Author: Clemens Lang <cal@macports.org>
AuthorDate: Tue Mar 19 01:57:01 2024 +0100
<span style='display:block; white-space:pre;color:#404040;'> macports1.0: Define global aliases for ui_progress_{generic,download}
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Those will always be available and transparently do nothing if the
</span><span style='display:block; white-space:pre;color:#404040;'> client does not support progress output or debug output is enabled.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> This significantly simplifies using the progress callbacks, and we had
</span><span style='display:block; white-space:pre;color:#404040;'> this functionality in port interpreters already anyway.
</span>---
src/macports1.0/macports.tcl | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/macports1.0/macports.tcl b/src/macports1.0/macports.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index db702a84b..c1c8f4722 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/macports1.0/macports.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/macports1.0/macports.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -366,9 +366,19 @@ proc ui_message {priority prefix args} {
</span> # Init (or re-init) all ui channels
proc macports::ui_init_all {} {
variable ui_priorities
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ variable ui_options
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> foreach priority $ui_priorities {
ui_init $priority
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach pname {progress_download progress_generic} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![macports::ui_isset ports_debug] && [info exists ui_options($pname)]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ interp alias {} ui_$pname {} $ui_options($pname)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ interp alias {} ui_$pname {} return -level 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
proc macports::ui_init {priority args} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1853,11 +1863,7 @@ proc macports::worker_init {workername portpath porturl portbuildpath options va
</span> }
# add the UI progress call-backs (or a no-op alias, if unavailable)
foreach pname {progress_download progress_generic} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[info exists ui_options($pname)]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $workername alias ui_$pname $ui_options($pname)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $workername alias ui_$pname return -level 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $workername alias ui_$pname ui_$pname
</span> }
# notifications callback
</pre><pre style='margin:0'>
</pre>