<pre style='margin:0'>
Chris Jones (cjones051073) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/ac96ebe45a4e9c70277542ff682bb178dd68cad4">https://github.com/macports/macports-ports/commit/ac96ebe45a4e9c70277542ff682bb178dd68cad4</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 ac96ebe45a4 openssl PG: Return error code when invalid openssl branch requested
</span>ac96ebe45a4 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit ac96ebe45a4e9c70277542ff682bb178dd68cad4
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Tue Nov 9 18:25:10 2021 +0000
<span style='display:block; white-space:pre;color:#404040;'> openssl PG: Return error code when invalid openssl branch requested
</span>---
_resources/port1.0/group/openssl-1.0.tcl | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/openssl-1.0.tcl b/_resources/port1.0/group/openssl-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 4b5a13e56ed..1d40d797d9f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/openssl-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/openssl-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -63,10 +63,16 @@ proc openssl::depends_portname {} {
</span> return openssl[openssl::branch_nodot]
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+proc openssl::known_branches {} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return [list no_version 1.0 1.1 3]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> proc openssl::check_branch {} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set branch_ok [ expr { [option openssl.branch] in [list no_version 1.0 1.1 3] } ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set branch_ok [ expr { [option openssl.branch] in [openssl::known_branches] } ]
</span> if { !${branch_ok} } {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "Invalid OpenSSL branch [option openssl.branch]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "Invalid OpenSSL branch '[option openssl.branch]'"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "Valid branches are '[openssl::known_branches]'"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -code error "Invalid OpenSSL branch"
</span> }
return ${branch_ok}
}
</pre><pre style='margin:0'>
</pre>