<pre style='margin:0'>
Rainer Müller (raimue) pushed a commit to branch master
in repository macports-base.
</pre>
<p><a href="https://github.com/macports/macports-base/commit/ce6d4817b3ce8cb4beeb26ac0591d5770a288798">https://github.com/macports/macports-base/commit/ce6d4817b3ce8cb4beeb26ac0591d5770a288798</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit ce6d4817b3ce8cb4beeb26ac0591d5770a288798
</span>Author: Rainer Müller <raimue@macports.org>
AuthorDate: Wed May 9 13:08:19 2018 +0200
<span style='display:block; white-space:pre;color:#404040;'> Deprecate port selfupdate --nosync, add --no-sync
</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/56434
</span>---
src/macports1.0/selfupdate.tcl | 4 ++--
src/port/port.tcl | 9 +++++++--
2 files changed, 9 insertions(+), 4 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/macports1.0/selfupdate.tcl b/src/macports1.0/selfupdate.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 7f34afd..eea5a40 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/macports1.0/selfupdate.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/macports1.0/selfupdate.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -145,7 +145,7 @@ proc selfupdate::main {{optionslist {}} {updatestatusvar {}}} {
</span> set comp [vercmp $macports_version_new $macports::autoconf::macports_version]
# syncing ports tree.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![info exists options(ports_selfupdate_nosync)] || !$options(ports_selfupdate_nosync)} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![info exists options(ports_selfupdate_no-sync)] || !$options(ports_selfupdate_no-sync)} {
</span> if {$comp > 0} {
# updated portfiles potentially need new base to parse - tell sync to try to
# use prefabricated PortIndex files and signal if it couldn't
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -218,7 +218,7 @@ proc selfupdate::main {{optionslist {}} {updatestatusvar {}}} {
</span> return -code error "Couldn't change permissions of the MacPorts sources at $mp_source_path to ${sources_owner}: $eMessage"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![info exists options(ports_selfupdate_nosync)] || !$options(ports_selfupdate_nosync)} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![info exists options(ports_selfupdate_no-sync)] || !$options(ports_selfupdate_no-sync)} {
</span> if {[info exists needed_portindex]} {
ui_msg "Not all sources could be fully synced using the old version of MacPorts."
ui_msg "Please run selfupdate again now that MacPorts base has been updated."
<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 0b9f45c..73a3a7e 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;'>@@ -2701,7 +2701,12 @@ proc action_selfupdate { action portlist opts } {
</span> if {[prefix_unwritable]} {
return 1
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { [catch {macports::selfupdate [array get global_options] base_updated} result ] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ array set options [array get global_options]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[info exists options(ports_${action}_nosync)] && $options(ports_${action}_nosync) eq "yes"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_warn "port selfupdate --nosync is deprecated, use --no-sync instead"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set options(ports_${action}_no-sync) $options(ports_${action}_nosync)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { [catch {macports::selfupdate [array get options] base_updated} result ] } {
</span> ui_debug $::errorInfo
ui_error $result
if {![macports::ui_isset ports_verbose]} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4394,7 +4399,7 @@ array set cmd_opts_array {
</span> depends description epoch exact glob homepage line
long_description maintainer maintainers name platform
platforms portdir regex revision variant variants version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- selfupdate {nosync}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ selfupdate {no-sync nosync}
</span> space {{units 1} total}
activate {no-exec}
deactivate {no-exec}
</pre><pre style='margin:0'>
</pre>