<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/167770de30e058366521fa2f64a659d6ac6690e8">https://github.com/macports/macports-ports/commit/167770de30e058366521fa2f64a659d6ac6690e8</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 167770de30e058366521fa2f64a659d6ac6690e8
</span>Author: Aaron Madlon-Kay <amake@macports.org>
AuthorDate: Wed Dec 12 22:09:27 2018 +0900
<span style='display:block; white-space:pre;color:#404040;'> golang portgroup: handle GitLab tarballs in post-extract
</span>---
_resources/port1.0/group/golang-1.0.tcl | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/golang-1.0.tcl b/_resources/port1.0/group/golang-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index b0a68dc..154954e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/golang-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/golang-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -258,6 +258,7 @@ proc handle_set_go_vendors {vendors_str} {
</span> #
# - GitHub: ${author}-${project}-${7-digit hash}
# - Bitbucket: ${author}-${project}-${12-digit hash}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# - GitLab: ${project}-${ref}
</span> #
# Support for additional hosts not conforming to this pattern will take some
# work.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -267,7 +268,14 @@ post-extract {
</span> # as the result will not be accurate when go.package has been
# customized.
file mkdir [file dirname ${worksrcpath}]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- move [glob ${workpath}/${go.author}-${go.project}-*] ${worksrcpath}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if [file exists [glob -nocomplain ${workpath}/${go.author}-${go.project}-*]] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # GitHub and Bitbucket follow this path
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move [glob ${workpath}/${go.author}-${go.project}-*] ${worksrcpath}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # GitLab follows this path
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move [glob ${workpath}/${go.project}-*] ${worksrcpath}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # If the above fails then something went wrong and we should error out.
</span> }
foreach vlist ${go.vendors_internal} {
</pre><pre style='margin:0'>
</pre>