<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/a7efac390ef1f7019b02653942c29ff90f439b91">https://github.com/macports/macports-base/commit/a7efac390ef1f7019b02653942c29ff90f439b91</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit a7efac390ef1f7019b02653942c29ff90f439b91
</span>Author: Rainer Müller <raimue@macports.org>
AuthorDate: Mon Apr 2 04:30:01 2018 +0200
<span style='display:block; white-space:pre;color:#404040;'> fetch: Use fetch.user and fetch.password for svn
</span>---
src/port1.0/portfetch.tcl | 25 +++++++++++++++++--------
1 file changed, 17 insertions(+), 8 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 c24124d..0b16ed1 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;'>@@ -582,6 +582,7 @@ proc portfetch::svnfetch {args} {
</span> global UI_PREFIX \
distpath workpath worksrcpath \
svn.cmd svn.url svn.revision svn.subdirs svn.ignore_keywords svn.file svn.file_prefix \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ fetch.user fetch.password \
</span> name distname fetch.type
set generatedfile "${distpath}/${svn.file}"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -598,30 +599,38 @@ proc portfetch::svnfetch {args} {
</span> append svn.url "@${svn.revision}"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set proxy_args [svn_proxy_args ${svn.url}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set args ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set exportargs ""
</span> if {${svn.ignore_keywords}} {
if {${svn.subdirs} ne ""} {
error "svn.ignore_keywords cannot be used together with svn.subdirs"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- append args " --ignore-keywords"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ append exportargs " --ignore-keywords"
</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;'>+ set connectargs ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ append connectargs [svn_proxy_args ${svn.url}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${fetch.user} ne ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ append connectargs " --username ${fetch.user}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${fetch.password} ne ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ append connectargs " --password ${fetch.password}"
</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 ${args} ${svn.url} ${exportpath}/${svn.file_prefix} 2>&1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set cmdstring "${svn.cmd} --non-interactive ${connectargs} export ${exportargs} ${svn.url} ${exportpath}/${svn.file_prefix} 2>&1"
</span> if {[catch {system $cmdstring} result]} {
return -code error [msgcat::mc "Subversion checkout failed"]
}
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set cmdstring "${svn.cmd} --non-interactive ${proxy_args} checkout --depth empty ${svn.url} ${exportpath}/${svn.file_prefix} 2>&1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set cmdstring "${svn.cmd} --non-interactive ${connectargs} checkout --depth empty ${svn.url} ${exportpath}/${svn.file_prefix} 2>&1"
</span> if {[catch {system $cmdstring} result]} {
return -code error [msgcat::mc "Subversion checkout failed"]
}
foreach dir ${svn.subdirs} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set cmdstring "${svn.cmd} --non-interactive ${proxy_args} update --depth infinity ${exportpath}/${svn.file_prefix}/${dir} 2>&1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set cmdstring "${svn.cmd} --non-interactive ${connectargs} update --depth infinity ${exportpath}/${svn.file_prefix}/${dir} 2>&1"
</span> if {[catch {system $cmdstring} result]} {
return -code error [msgcat::mc "Subversion update for subdir $dir failed"]
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -637,7 +646,7 @@ proc portfetch::svnfetch {args} {
</span> ui_info "$UI_PREFIX Generating tarball ${svn.file}"
# get timestamp of latest revision
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set cmdstring "${svn.cmd} --non-interactive ${proxy_args} info --show-item last-changed-date ${svn.url}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set cmdstring "${svn.cmd} --non-interactive ${connectargs} info --show-item last-changed-date ${svn.url}"
</span> if {[catch {exec -ignorestderr sh -c $cmdstring} result]} {
return -code error [msgcat::mc "Subversion info failed"]
}
</pre><pre style='margin:0'>
</pre>