<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/cc7d0b9bd44e237421bbe9a0d294a140a8ff91bf">https://github.com/macports/macports-base/commit/cc7d0b9bd44e237421bbe9a0d294a140a8ff91bf</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit cc7d0b9bd44e237421bbe9a0d294a140a8ff91bf
</span>Author: Rainer Müller <raimue@macports.org>
AuthorDate: Sun Apr 15 20:29:38 2018 +0200
<span style='display:block; white-space:pre;color:#404040;'> mirror: Do not try to mirror from mirrors
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> When mirroring, we do not have to query our own mirrors as they cannot
</span><span style='display:block; white-space:pre;color:#404040;'> provide this file yet.
</span>---
src/port1.0/portmirror.tcl | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/port1.0/portmirror.tcl b/src/port1.0/portmirror.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index c4e2c12..e4b4a44 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/port1.0/portmirror.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/port1.0/portmirror.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -51,13 +51,19 @@ namespace eval portmirror {
</span> # It also records the path in a database.
proc portmirror::mirror_main {args} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- global mirror_filemap portdbpath subport license
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global mirror_filemap portdbpath subport license ports_fetch_no-mirrors
</span>
if {[lsearch -exact -nocase $license "nomirror"] >= 0} {
ui_info "Not mirroring $subport due to license NoMirror"
return
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # do not try to mirror from mirrors
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[info exists ports_fetch_no-mirrors]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set ports_fetch_no-mirrors.orig ${ports_fetch_no-mirrors}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set ports_fetch_no-mirrors yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> set mirror_filemap_path [file join $portdbpath distfiles_mirror.db]
filemap open mirror_filemap $mirror_filemap_path
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -80,4 +86,11 @@ proc portmirror::mirror_main {args} {
</span>
# close the filemap.
filemap close mirror_filemap
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # restore original value
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[info exists ports_fetch_no-mirrors.orig]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set ports_fetch_no-mirrors ${ports_fetch_no-mirrors.orig}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unset ports_fetch_no-mirrors
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
</pre><pre style='margin:0'>
</pre>