<pre style='margin:0'>
Blair Zajac (blair) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/d21145e3bbc08fbdd2ec317f6fc6bcc8da231dac">https://github.com/macports/macports-ports/commit/d21145e3bbc08fbdd2ec317f6fc6bcc8da231dac</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit d21145e3bbc08fbdd2ec317f6fc6bcc8da231dac
</span>Author: Blair Zajac <blair@macports.org>
AuthorDate: Thu Jan 28 21:27:43 2021 -0800
<span style='display:block; white-space:pre;color:#404040;'> cmake: set new python_branch value before using it
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Follow up 7caeafd874e.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes: https://trac.macports.org/ticket/62174
</span>---
devel/cmake/Portfile | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/cmake/Portfile b/devel/cmake/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c38e32da966..8d90550e522 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/cmake/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/cmake/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -259,15 +259,15 @@ if {${subport} eq ${name}} {
</span> }
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Get python branch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set python_branch "[string range ${pyver} 0 end-1].[string index ${pyver} end]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if {[variant_isset python${pyver}]} {
set python_isset true
set PYTHON_VERSION_WITH_DOT ${python_branch}
set PYTHON_VERSION_NO_DOT ${pyver}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Get python branch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set python_branch "[string range ${pyver} 0 end-1].[string index ${pyver} end]"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> variant python${pyver} conflicts {*}${other_python_versions} requires docs description "Build documentation using ${python_branch} sphinx" {}
}
</pre><pre style='margin:0'>
</pre>