<pre style='margin:0'>
Clemens Lang (neverpanic) pushed a commit to branch master
in repository macports-base.
</pre>
<p><a href="https://github.com/macports/macports-base/commit/0cf1faf216c59419fb22edcd304ce02571d10504">https://github.com/macports/macports-base/commit/0cf1faf216c59419fb22edcd304ce02571d10504</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 0cf1faf New argument port fetch --no-mirrors
</span>0cf1faf is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 0cf1faf216c59419fb22edcd304ce02571d10504
</span>Author: Rainer Müller <raimue@macports.org>
AuthorDate: Thu Jul 6 17:31:15 2017 +0200
<span style='display:block; white-space:pre;color:#404040;'> New argument port fetch --no-mirrors
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> This flag avoids adding the mirrors defined by global_mirror_site to the
</span><span style='display:block; white-space:pre;color:#404040;'> list of fetch URLs. This is meant to aid in development of port updates.
</span><span style='display:block; white-space:pre;color:#404040;'> No mirror will have a distfile for a new port version, so there is no
</span><span style='display:block; white-space:pre;color:#404040;'> need to try.
</span>---
src/port/port.tcl | 1 +
src/port1.0/fetch_common.tcl | 15 ++++++++++-----
src/port1.0/portfetch.tcl | 13 +++++++++----
3 files changed, 20 insertions(+), 9 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/port/port.tcl b/src/port/port.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 68572aa..bc45337 100755
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/port/port.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/port/port.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4450,6 +4450,7 @@ array set cmd_opts_array {
</span> rev-upgrade {id-loadcmd-check}
diagnose {quiet}
reclaim {enable-reminders disable-reminders}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ fetch {no-mirrors}
</span> }
##
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/port1.0/fetch_common.tcl b/src/port1.0/fetch_common.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 4f48c3b..0e49dce 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/port1.0/fetch_common.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/port1.0/fetch_common.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -160,12 +160,17 @@ proc portfetch::checksites {sitelists mirrorfile} {
</span> continue
}
global ${listname}.mirror_subdir
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # add the specified global and user-defined mirrors
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set sglobal [lindex $extras 0]; set senv [lindex $extras 1]
</span> set full_list [set $listname]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- append full_list " $sglobal"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[info exists env($senv)]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set full_list [concat $env($senv) $full_list]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # add the specified global and user-defined mirrors
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set sglobal ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set senv ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[llength $extras] >= 2} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set sglobal [lindex $extras 0]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set senv [lindex $extras 1]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ append full_list " $sglobal"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[info exists env($senv)]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set full_list [concat $env($senv) $full_list]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
set site_list [list]
<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 ed2a8ff..cf185dc 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;'>@@ -272,12 +272,17 @@ proc portfetch::get_full_mirror_sites_path {} {
</span> # Perform the full checksites/checkpatchfiles/checkdistfiles sequence.
# This method is used by distcheck target.
proc portfetch::checkfiles {urls} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- global global_mirror_site
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global global_mirror_site ports_fetch_no-mirrors
</span> upvar $urls fetch_urls
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksites [list patch_sites [list $global_mirror_site PATCH_SITE_LOCAL] \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- master_sites [list $global_mirror_site MASTER_SITE_LOCAL]] \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [get_full_mirror_sites_path]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set sites [list patch_sites {} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ master_sites {}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![info exists ports_fetch_no-mirrors] || ${ports_fetch_no-mirrors} eq "no"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set sites [list patch_sites [list $global_mirror_site PATCH_SITE_LOCAL] \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ master_sites [list $global_mirror_site MASTER_SITE_LOCAL]]
</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;'>+ checksites $sites [get_full_mirror_sites_path]
</span> checkpatchfiles fetch_urls
checkdistfiles fetch_urls
}
</pre><pre style='margin:0'>
</pre>