<pre style='margin:0'>
Rainer Müller (raimue) pushed a commit to branch release-2.4
in repository macports-base.
</pre>
<p><a href="https://github.com/macports/macports-base/commit/7a87293ad9ff60ff93fa9c110ced1e7a9761e12e">https://github.com/macports/macports-base/commit/7a87293ad9ff60ff93fa9c110ced1e7a9761e12e</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 7a87293ad9ff60ff93fa9c110ced1e7a9761e12e
</span>Author: Rainer Müller <raimue@macports.org>
AuthorDate: Wed Mar 7 14:51:07 2018 +0100
<span style='display:block; white-space:pre;color:#404040;'> port mirror: Respect special license NoMirror
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Use this license to prevent mirroring of ports which license does not
</span><span style='display:block; white-space:pre;color:#404040;'> allow to host their distfiles on our servers.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> (cherry picked from commit fae17c2c7b97f2c6b8d9ab527ef6776b93353a00)
</span>---
src/port1.0/portmirror.tcl | 7 ++++++-
1 file changed, 6 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 b3886c1..f7c9a85 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,7 +51,12 @@ 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 fetch.type mirror_filemap portdbpath
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global fetch.type mirror_filemap portdbpath subport license
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[lsearch -exact -nocase $license "nomirror"] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_info "Not mirroring $subport due to license NoMirror"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return
</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
</pre><pre style='margin:0'>
</pre>