<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch release-2.7
in repository macports-base.

</pre>
<p><a href="https://github.com/macports/macports-base/commit/840dff21588444a964adb480b4451e0d64cd3b95">https://github.com/macports/macports-base/commit/840dff21588444a964adb480b4451e0d64cd3b95</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 840dff21588444a964adb480b4451e0d64cd3b95
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Sat Jan 15 19:48:33 2022 +1100

<span style='display:block; white-space:pre;color:#404040;'>    upgrade: don't print errorInfo for non-errors
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    (cherry picked from commit e5e7dffad9df9b3c704e3eff331b5c8bb87d10ff)
</span>---
 src/macports1.0/macports.tcl | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 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 e9e0b800..35d76b60 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;'>@@ -4254,28 +4254,31 @@ proc macports::_upgrade {portname dspec variationslist optionslist {depscachenam
</span>             # doing this instead of just running install ensures that we have the
             # new copy ready but not yet installed, so we can safely uninstall the
             # existing one.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            if {[catch {set result [mportexec $mport archivefetch]} result] || $result != 0} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                if {[info exists ::errorInfo]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    ui_debug $::errorInfo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            if {[catch {mportexec $mport archivefetch} result]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                ui_debug $::errorInfo
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                catch {mportclose $mport}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                return 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            } elseif {$result != 0} {
</span>                 catch {mportclose $mport}
                 return 1
             }
             # the following is a noop if archivefetch found an archive
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            if {[catch {set result [mportexec $mport destroot]} result] || $result != 0} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                if {[info exists ::errorInfo]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    ui_debug $::errorInfo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            if {[catch {mportexec $mport destroot} result]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                ui_debug $::errorInfo
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                catch {mportclose $mport}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                return 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            } elseif {$result != 0} {
</span>                 catch {mportclose $mport}
                 return 1
             }
         } else {
             # Normal non-forced case
             # install version_in_tree (but don't activate yet)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            if {[catch {set result [mportexec $mport install]} result] || $result != 0} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                if {[info exists ::errorInfo]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    ui_debug $::errorInfo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            if {[catch {mportexec $mport install} result]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                ui_debug $::errorInfo
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                catch {mportclose $mport}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                return 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            } elseif {$result != 0} {
</span>                 catch {mportclose $mport}
                 return 1
             }
</pre><pre style='margin:0'>

</pre>