<pre style='margin:0'>
Rainer Müller (raimue) pushed a commit to branch vcs-fetch
in repository macports-base.
</pre>
<p><a href="https://github.com/macports/macports-base/commit/8052d245d1e7ef1f5fc9a7bef0daa4042f7cf900">https://github.com/macports/macports-base/commit/8052d245d1e7ef1f5fc9a7bef0daa4042f7cf900</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 8052d245d1e7ef1f5fc9a7bef0daa4042f7cf900
</span>Author: Rainer Müller <raimue@macports.org>
AuthorDate: Sun Mar 11 17:16:38 2018 +0100
<span style='display:block; white-space:pre;color:#404040;'> Use a generic check if a port is tarballable
</span>---
src/port1.0/portfetch.tcl | 33 ++++++++++++++++++++++-----------
1 file changed, 22 insertions(+), 11 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/port1.0/portfetch.tcl b/src/port1.0/portfetch.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 6931110..3cb287d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/port1.0/portfetch.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/port1.0/portfetch.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -441,6 +441,27 @@ proc portfetch::svnfetch {args} {
</span> return 0
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Check if a tarball can be produced for git
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+proc portfetch::git_tarballable {args} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global git.branch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${git.branch} eq ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Returns true if port is fetched from VCS and can be put into a tarball
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+proc portfetch::tarballable {args} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global fetch.type
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ switch -- "${fetch.type}" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ git {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return [git_tarballable]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # Returns true if port can be mirrored
proc portfetch::mirrorable {args} {
global fetch.type
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -450,7 +471,7 @@ proc portfetch::mirrorable {args} {
</span> ui_debug "port cannot be mirrored, no checksums for ${fetch.type}"
return no
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![git_tarballable]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![tarballable]} {
</span> ui_debug "port cannot be mirrored, not tarballable for ${fetch.type}"
return no
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -463,16 +484,6 @@ proc portfetch::mirrorable {args} {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Check if a tarball can be produced for git
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-proc portfetch::git_tarballable {args} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- global git.branch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${git.branch} eq ""} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # Perform a git fetch
proc portfetch::gitfetch {args} {
global UI_PREFIX \
</pre><pre style='margin:0'>
</pre>