<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/ee1ff6668ab2027d6a195e0cb95f983f408808f2">https://github.com/macports/macports-base/commit/ee1ff6668ab2027d6a195e0cb95f983f408808f2</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 ee1ff666 mportopen: close mport if sourcing Portfile fails
</span>ee1ff666 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit ee1ff6668ab2027d6a195e0cb95f983f408808f2
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Fri Mar 19 10:16:59 2021 +1100
<span style='display:block; white-space:pre;color:#404040;'> mportopen: close mport if sourcing Portfile fails
</span>---
src/macports1.0/macports.tcl | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
<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 0d02fc4d..ba9d42b4 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;'>@@ -1916,7 +1916,11 @@ proc mportopen {porturl {options {}} {variations {}} {nocache {}}} {
</span>
macports::worker_init $workername $portpath $porturl [macports::getportbuildpath $portpath] $options $variations
<span style='display:block; white-space:pre;background:#ffe0e0;'>- $workername eval {source Portfile}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[catch {$workername eval {source Portfile}} result]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mportclose $mport
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug $::errorInfo
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ error $result
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
# add the default universal variant if appropriate, and set up flags that
# are conditional on whether universal is set
</pre><pre style='margin:0'>
</pre>