<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/718a2072dad40298b01285de418edf5d9682b5da">https://github.com/macports/macports-base/commit/718a2072dad40298b01285de418edf5d9682b5da</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 718a2072dad40298b01285de418edf5d9682b5da
</span>Author: Rainer Müller <raimue@macports.org>
AuthorDate: Mon Mar 19 00:37:00 2018 +0100
<span style='display:block; white-space:pre;color:#404040;'> fetch: Remove svn.method option
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> The executed command should not be configurable, as it is defined by the
</span><span style='display:block; white-space:pre;color:#404040;'> fetch code. Other methods could interfere the tarball creation.
</span>---
src/port1.0/portfetch.tcl | 7 +++----
1 file changed, 3 insertions(+), 4 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 a5e3ceb..00cb28d 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.url bzr.revision bzr.file bzr.file_prefix \
cvs.module cvs.root cvs.password cvs.date cvs.tag cvs.file cvs.file_prefix \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- svn.cmd svn.url svn.revision svn.method svn.pre_args svn.args svn.post_args svn.file svn.file_prefix \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ svn.cmd svn.url svn.revision svn.pre_args svn.args svn.post_args 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;'>@@ -82,7 +82,6 @@ default cvs.file_prefix {${distname}}
</span>
default svn.cmd {[portfetch::find_svn_path]}
default svn.dir {${workpath}}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default svn.method {export}
</span> default svn.revision ""
default svn.env {}
default svn.pre_args {"--non-interactive --trust-server-cert"}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -589,7 +588,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.method svn.revision svn.url svn.file svn.file_prefix \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ svn.cmd svn.args svn.revision svn.url svn.file svn.file_prefix \
</span> name distname fetch.type
set generatedfile "${distpath}/${svn.file}"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -612,7 +611,7 @@ proc portfetch::svnfetch {args} {
</span> ui_info "$UI_PREFIX Checking out ${fetch.type} repository"
set tmppath [mkdtemp "/tmp/macports.portfetch.${name}.XXXXXXXX"]
set tmpxprt [file join ${tmppath} export]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set cmdstring "${svn.cmd} ${svn.method} ${svn.args} ${svn.url} ${tmpxprt}/${svn.file_prefix} 2>&1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set cmdstring "${svn.cmd} export ${svn.args} ${svn.url} ${tmpxprt}/${svn.file_prefix} 2>&1"
</span> if {[catch {system $cmdstring} result]} {
delete ${tmppath}
return -code error [msgcat::mc "Subversion checkout failed"]
</pre><pre style='margin:0'>
</pre>