<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository mpbb.
</pre>
<p><a href="https://github.com/macports/mpbb/commit/3bff6483beca0a0421f3265e0410e6ed91136553">https://github.com/macports/mpbb/commit/3bff6483beca0a0421f3265e0410e6ed91136553</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 3bff648 Adopt Tcl 8.6 try syntax
</span>3bff648 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 3bff6483beca0a0421f3265e0410e6ed91136553
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Fri Oct 21 02:00:51 2022 +1100
<span style='display:block; white-space:pre;color:#404040;'> Adopt Tcl 8.6 try syntax
</span>---
tools/canonical-variants.tcl | 4 ++--
tools/dependencies.tcl | 20 ++++++++++----------
tools/portgroups.tcl | 4 ++--
tools/uninstall-unneeded-ports.tcl | 8 ++++----
4 files changed, 18 insertions(+), 18 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/tools/canonical-variants.tcl b/tools/canonical-variants.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index e74461a..5c0dabe 100755
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/tools/canonical-variants.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/tools/canonical-variants.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -55,7 +55,7 @@ try {
</span> ui_error "No such port: $portname"
exit 1
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} catch {{*} eCode eMessage} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} on error {eMessage} {
</span> ui_error "mportlookup $portname failed: $eMessage"
exit 1
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -73,7 +73,7 @@ array set portinfo [lindex $result 1]
</span> #try -pass_signal {...}
try {
set mport [mportopen $portinfo(porturl) [list subport $portname] [array get variants]]
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} catch {{*} eCode eMessage} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} on error {eMessage} {
</span> ui_error "mportopen ${portinfo(porturl)} failed: $eMessage"
exit 1
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/tools/dependencies.tcl b/tools/dependencies.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index a33c5a3..1249dbd 100755
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/tools/dependencies.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/tools/dependencies.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -88,7 +88,7 @@ try {
</span> ui_error "No such port: $portname"
exit 1
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} catch {{*} eCode eMessage} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} on error {eMessage} {
</span> ui_error "mportlookup $portname failed: $eMessage"
exit 2
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -106,7 +106,7 @@ array set portinfo [lindex $result 1]
</span> #try -pass_signal {...}
try {
set mport [mportopen $portinfo(porturl) [list subport $portinfo(name)] [array get variants]]
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} catch {{*} eCode eMessage} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} on error {eMessage} {
</span> ui_error "mportopen ${portinfo(porturl)} failed: $eMessage"
exit 2
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -203,7 +203,7 @@ proc get_maintainers {args} {
</span> if {[llength $result] < 2} {
continue
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } catch {{*} eCode eMessage} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } on error {eMessage} {
</span> ui_error "mportlookup $portname failed: $eMessage"
continue
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -228,14 +228,14 @@ proc open_port {portname} {
</span> puts $::log_subports_progress "Building '$::portname' ... \[ERROR\] (unknown dependency '$portname') maintainers: [get_maintainers $::portname]."
exit 1
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } catch {{*} eCode eMessage} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } on error {eMessage} {
</span> ui_error "mportlookup $portname failed: $eMessage"
exit 2
}
array set portinfo [lindex $result 1]
try {
set mport [mportopen $portinfo(porturl) [list subport $portinfo(name)] [list]]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } catch {{*} eCode eMessage} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } on error {eMessage} {
</span> ui_error "mportopen $portinfo(porturl) failed: $eMessage"
exit 2
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -370,7 +370,7 @@ try {
</span> set dlist_sorted [list]
dlist_eval $dlist {} [list append_it]
unset dlist
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} catch {{*} eCode eMessage} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} on error {eMessage} {
</span> ui_error "sorting dlist failed: $eMessage"
exit 2
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -409,7 +409,7 @@ if {$failcache_dir ne ""} {
</span> foreach ditem $dlist_sorted {
checkdep_failcache $ditem
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } catch {{*} eCode eMessage} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } on error {eMessage} {
</span> ui_error "checkdep_failcache failed: $eMessage"
exit 2
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -545,7 +545,7 @@ try {
</span> foreach ditem $dlist_sorted {
install_dep $ditem
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} catch {{*} eCode eMessage} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} on error {eMessage} {
</span> ui_error "install_dep failed: $eMessage"
exit 2
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -560,7 +560,7 @@ if {$any_built} {
</span> # active ports likely changed, so do this again
try {
deactivate_unneeded portinfo
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } catch {{*} eCode eMessage} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } on error {eMessage} {
</span> ui_error "deactivate_unneeded failed: $eMessage"
exit 2
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -590,7 +590,7 @@ try {
</span> foreach ditem $dlist_sorted {
activate_dep $ditem
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} catch {{*} eCode eMessage} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} on error {eMessage} {
</span> ui_error "activate_dep failed: $eMessage"
exit 2
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/tools/portgroups.tcl b/tools/portgroups.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 93071b9..726f071 100755
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/tools/portgroups.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/tools/portgroups.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -68,7 +68,7 @@ try {
</span> ui_error "No such port: $portname"
exit 1
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} catch {{*} eCode eMessage} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} on error {eMessage} {
</span> ui_error "mportlookup $portname failed: $eMessage"
exit 1
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -78,7 +78,7 @@ array set portinfo [lindex $result 1]
</span> #try -pass_signal {...}
try {
set mport [mportopen $portinfo(porturl) [list subport $portname] $variations]
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} catch {{*} eCode eMessage} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} on error {eMessage} {
</span> ui_error "mportopen ${portinfo(porturl)} failed: $eMessage"
exit 1
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/tools/uninstall-unneeded-ports.tcl b/tools/uninstall-unneeded-ports.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 6724d7e..8889d59 100755
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/tools/uninstall-unneeded-ports.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/tools/uninstall-unneeded-ports.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -43,10 +43,10 @@ if {$showVersion} {
</span> # (regardless of whether or not those dependents are currently installed)
foreach source $macports::sources {
set source [lindex $source 0]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- try -pass_signal {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ macports_try -pass_signal {
</span> set fd [open [macports::getindex $source] r]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- try -pass_signal {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ macports_try -pass_signal {
</span> while {[gets $fd line] >= 0} {
array unset portinfo
set name [lindex $line 0]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -65,13 +65,13 @@ foreach source $macports::sources {
</span> }
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } catch {*} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } on error {} {
</span> ui_warn "It looks like your PortIndex file for $source may be corrupt."
throw
} finally {
close $fd
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } catch {*} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } on error {} {
</span> ui_warn "Can't open index file for source: $source"
}
}
</pre><pre style='margin:0'>
</pre>