<pre style='margin:0'>
Michael Dickens (michaelld) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/55ae58413848339985e5476fc06233960b52bdcc">https://github.com/macports/macports-ports/commit/55ae58413848339985e5476fc06233960b52bdcc</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 55ae584 github 1.0 PortGroup: fix for unexpected repo name
</span>55ae584 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 55ae58413848339985e5476fc06233960b52bdcc
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Fri Apr 14 13:45:38 2017 -0400
<span style='display:block; white-space:pre;color:#404040;'> github 1.0 PortGroup: fix for unexpected repo name
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> fix the case when the GitHub repo name has changed from that expected, to just error out and print something useful.
</span>---
_resources/port1.0/group/github-1.0.tcl | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/github-1.0.tcl b/_resources/port1.0/group/github-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 8241ce6..72f813e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/github-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/github-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -174,9 +174,13 @@ proc github.setup {gh_author gh_project gh_version {gh_tag_prefix ""}} {
</span> [lsearch -exact ${master_sites} ${github.master_sites}] != -1 && \
[llength ${distfiles}] > 0 && \
[llength [glob -nocomplain ${workpath}/*]] > 0} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[file exists [glob ${workpath}/${github.author}-${github.project}-*]] && \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [file isdirectory [glob ${workpath}/${github.author}-${github.project}-*]]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[file exists [glob -nocomplain ${workpath}/${github.author}-${github.project}-*]] && \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [file isdirectory [glob -nocomplain ${workpath}/${github.author}-${github.project}-*]]} {
</span> move [glob ${workpath}/${github.author}-${github.project}-*] ${workpath}/${distname}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # tarball is not "${github.author}-${github.project}-*"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "\n\ngithub PortGroup: Error: tarball name is not as expected. This might mean that the repository name is different than set in the Portfile. Please review and try to correct.\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -code error "Unexpected github tarball extract."
</span> }
}
}
</pre><pre style='margin:0'>
</pre>