<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-base.
</pre>
<p><a href="https://github.com/macports/macports-base/commit/0ec55f5a00e90e99ede8dda37837b321062e8fb0">https://github.com/macports/macports-base/commit/0ec55f5a00e90e99ede8dda37837b321062e8fb0</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 0ec55f5a0 Pass fetch.{user,password} to svn
</span>0ec55f5a0 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 0ec55f5a00e90e99ede8dda37837b321062e8fb0
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Tue May 27 21:38:28 2025 +1000
<span style='display:block; white-space:pre;color:#404040;'> Pass fetch.{user,password} to svn
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/21232
</span>---
src/port1.0/portfetch.tcl | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
<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 e3452ee53..b1e01c817 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;'>@@ -403,7 +403,8 @@ proc portfetch::svn_proxy_args {url} {
</span>
# Perform an svn fetch
proc portfetch::svnfetch {args} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- global svn.args svn.method svn.revision svn.url patchfiles
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global svn.args svn.method svn.revision svn.url patchfiles \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fetch.user fetch.password
</span>
if {[regexp {\s} ${svn.url}]} {
return -code error [msgcat::mc "Subversion URL cannot contain whitespace"]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -416,6 +417,12 @@ proc portfetch::svnfetch {args} {
</span> if {[option fetch.ignore_sslcert]} {
svn.pre_args-append --trust-server-cert
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${fetch.user} ne {}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ svn.pre_args-append --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;'>+ svn.pre_args-append --password ${fetch.password}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
set proxy_args [svn_proxy_args ${svn.url}]
</pre><pre style='margin:0'>
</pre>