<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/6300bbc4871a578f61142c808936764eb1196435">https://github.com/macports/macports-base/commit/6300bbc4871a578f61142c808936764eb1196435</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 6300bbc4871a578f61142c808936764eb1196435
</span>Author: Rainer Müller <raimue@macports.org>
AuthorDate: Mon Apr 2 04:19:46 2018 +0200
<span style='display:block; white-space:pre;color:#404040;'> fetch: Add svn.ignore_keywords for svn export
</span>---
src/port1.0/portfetch.tcl | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 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 84fde4e..c24124d 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;'>@@ -51,7 +51,7 @@ options master_sites patch_sites extract.suffix distfiles patchfiles use_bzip2 u
</span> master_sites.mirror_subdir patch_sites.mirror_subdir \
bzr.cmd bzr.url bzr.revision bzr.file bzr.file_prefix \
cvs.cmd cvs.root cvs.password cvs.module cvs.tag cvs.date cvs.file cvs.file_prefix \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- svn.cmd svn.url svn.revision svn.subdirs svn.file svn.file_prefix \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ svn.cmd svn.url svn.revision svn.subdirs svn.ignore_keywords svn.file svn.file_prefix \
</span> git.cmd git.url git.branch git.file git.file_prefix git.fetch_submodules \
hg.cmd hg.url hg.tag hg.file hg.file_prefix
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -77,6 +77,7 @@ default svn.cmd {[portfetch::find_svn_path]}
</span> default svn.url ""
default svn.revision ""
default svn.subdirs ""
<span style='display:block; white-space:pre;background:#e0ffe0;'>+default svn.ignore_keywords no
</span> default svn.file {${distname}.${fetch.type}.tar.bz2}
default svn.file_prefix {${distname}}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -580,7 +581,7 @@ proc portfetch::svn_proxy_args {url} {
</span> proc portfetch::svnfetch {args} {
global UI_PREFIX \
distpath workpath worksrcpath \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- svn.cmd svn.args svn.revision svn.url svn.subdirs svn.file svn.file_prefix \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ svn.cmd svn.url svn.revision svn.subdirs svn.ignore_keywords svn.file svn.file_prefix \
</span> name distname fetch.type
set generatedfile "${distpath}/${svn.file}"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -599,10 +600,18 @@ proc portfetch::svnfetch {args} {
</span>
set proxy_args [svn_proxy_args ${svn.url}]
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ set args ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${svn.ignore_keywords}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${svn.subdirs} ne ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ error "svn.ignore_keywords cannot be used together with svn.subdirs"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ append args " --ignore-keywords"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> ui_info "$UI_PREFIX Checking out ${fetch.type} repository"
set exportpath [file join ${workpath} export]
if {${svn.subdirs} eq ""} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set cmdstring "${svn.cmd} --non-interactive ${proxy_args} export ${svn.url} ${exportpath}/${svn.file_prefix} 2>&1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set cmdstring "${svn.cmd} --non-interactive ${proxy_args} export ${args} ${svn.url} ${exportpath}/${svn.file_prefix} 2>&1"
</span> if {[catch {system $cmdstring} result]} {
return -code error [msgcat::mc "Subversion checkout failed"]
}
</pre><pre style='margin:0'>
</pre>