<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-base.
</pre>
<p><a href="https://github.com/macports/macports-base/commit/8f4b9e5830479427e1ae09e3d87089c37cb3442b">https://github.com/macports/macports-base/commit/8f4b9e5830479427e1ae09e3d87089c37cb3442b</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 8f4b9e58 Fix loss of error status from selfupdate::main
</span>8f4b9e58 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 8f4b9e5830479427e1ae09e3d87089c37cb3442b
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Sat Apr 17 12:52:54 2021 +1000
<span style='display:block; white-space:pre;color:#404040;'> Fix loss of error status from selfupdate::main
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> There seems to be a bug with the 'try' procedure that suppresses errors
</span><span style='display:block; white-space:pre;color:#404040;'> generated by "return -code error" inside the catch clause.
</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/56549
</span>---
src/macports1.0/selfupdate.tcl | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/macports1.0/selfupdate.tcl b/src/macports1.0/selfupdate.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 6b32768d..cfae374b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/macports1.0/selfupdate.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/macports1.0/selfupdate.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -71,7 +71,7 @@ proc selfupdate::main {{optionslist {}} {updatestatusvar {}}} {
</span> try -pass_signal {
system "$rsync_path $rsync_options rsync://${rsync_server}/$rsync_dir $mp_source_path"
} catch {{*} eCode eMessage} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return -code error "Error synchronizing MacPorts sources: $eMessage"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ error "Error synchronizing MacPorts sources: $eMessage"
</span> }
if {$is_tarball} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -80,7 +80,7 @@ proc selfupdate::main {{optionslist {}} {updatestatusvar {}}} {
</span> try -pass_signal {
system "$rsync_path $rsync_options rsync://${rsync_server}/${rsync_dir}.rmd160 $mp_source_path"
} catch {{*} eCode eMessage} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return -code error "Error synchronizing MacPorts source signature: $eMessage"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ error "Error synchronizing MacPorts source signature: $eMessage"
</span> }
set openssl [macports::findBinary openssl $macports::autoconf::openssl_path]
set tarball ${mp_source_path}/[file tail $rsync_dir]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -108,7 +108,7 @@ proc selfupdate::main {{optionslist {}} {updatestatusvar {}}} {
</span> try -pass_signal {
system $tar_cmd
} catch {*} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return -code error "Failed to extract MacPorts sources from tarball!"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ error "Failed to extract MacPorts sources from tarball!"
</span> }
file delete -force ${mp_source_path}/base
file rename ${mp_source_path}/tmp/base ${mp_source_path}/base
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -154,7 +154,7 @@ proc selfupdate::main {{optionslist {}} {updatestatusvar {}}} {
</span> try {
mportsync $optionslist
} catch {{*} eCode eMessage} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return -code error "Couldn't sync the ports tree: $eMessage"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ error "Couldn't sync the ports tree: $eMessage"
</span> }
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -221,7 +221,7 @@ proc selfupdate::main {{optionslist {}} {updatestatusvar {}}} {
</span> try {
system -W $mp_source_path "${cc_arg}${sdk_arg}./configure $configure_args && ${sdk_arg}make SELFUPDATING=1 && make install SELFUPDATING=1"
} catch {{*} eCode eMessage} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return -code error "Error installing new MacPorts base: $eMessage"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ error "Error installing new MacPorts base: $eMessage"
</span> }
if {[info exists updatestatus]} {
set updatestatus yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -239,7 +239,7 @@ proc selfupdate::main {{optionslist {}} {updatestatusvar {}}} {
</span> try {
exec [macports::findBinary chown $macports::autoconf::chown_path] -R $sources_owner [file join $portdbpath sources/]
} catch {{*} eCode eMessage} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return -code error "Couldn't change permissions of the MacPorts sources at $mp_source_path to ${sources_owner}: $eMessage"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ error "Couldn't change permissions of the MacPorts sources at $mp_source_path to ${sources_owner}: $eMessage"
</span> }
if {![info exists options(ports_selfupdate_no-sync)] || !$options(ports_selfupdate_no-sync)} {
</pre><pre style='margin:0'>
</pre>