<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/36bb93b67700e12ee1519397ec836bc527a52d89">https://github.com/macports/macports-base/commit/36bb93b67700e12ee1519397ec836bc527a52d89</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 36bb93b67700e12ee1519397ec836bc527a52d89
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Mon Oct 10 12:12:43 2022 +1100

<span style='display:block; white-space:pre;color:#404040;'>    Catch error from NULL cxx_stdlib in registry
</span>---
 src/macports1.0/macports.tcl | 9 +++++++--
 1 file changed, 7 insertions(+), 2 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 87c5bff39..e79f9fc30 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;'>@@ -4168,8 +4168,13 @@ proc macports::_upgrade {portname dspec variationslist optionslist {depscachenam
</span>     set requestedflag [$regref requested]
     set os_platform_installed [$regref os_platform]
     set os_major_installed [$regref os_major]
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    set cxx_stdlib_installed [$regref cxx_stdlib]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    set cxx_stdlib_overridden [$regref cxx_stdlib_overridden]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # These might error if the info is not present in the registry.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    if {[catch {$regref cxx_stdlib} cxx_stdlib_installed]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        set cxx_stdlib_installed ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    if {[catch {$regref cxx_stdlib_overridden} cxx_stdlib_overridden]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        set cxx_stdlib_overridden 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    }
</span> 
     # Before we do
     # dependencies, we need to figure out the final variants,
</pre><pre style='margin:0'>

</pre>