<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/927b174237d9bb3c08fd2d4a0d6e63dbf1c4ac30">https://github.com/macports/macports-ports/commit/927b174237d9bb3c08fd2d4a0d6e63dbf1c4ac30</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 927b174237d muniversal 1.1 pg: always catch sysctl errors
</span>927b174237d is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 927b174237d9bb3c08fd2d4a0d6e63dbf1c4ac30
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Fri Jun 3 09:53:07 2022 +1000
<span style='display:block; white-space:pre;color:#404040;'> muniversal 1.1 pg: always catch sysctl errors
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes: https://github.com/macports/macports-webapp/issues/342
</span>---
_resources/port1.0/group/muniversal-1.1.tcl | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/muniversal-1.1.tcl b/_resources/port1.0/group/muniversal-1.1.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index a76e103e09c..6ff16fba3be 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/muniversal-1.1.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/muniversal-1.1.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -183,8 +183,8 @@ proc muniversal::cpu64bit_capable {} {
</span> # Doesn't really matter what we return here.
return 1
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[option os.major] >= 9} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return [sysctl hw.cpu64bit_capable]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[option os.major] >= 9 && ![catch {sysctl hw.cpu64bit_capable} result]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return $result
</span> } elseif {(![catch {sysctl hw.optional.x86_64} is_x86_64] && ${is_x86_64})
|| (![catch {sysctl hw.optional.64bitops} is_ppc64] && ${is_ppc64})} {
return 1
</pre><pre style='margin:0'>
</pre>