<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/ebd49cf108f9f70700030f236357fa6e1c35c8b9">https://github.com/macports/macports-base/commit/ebd49cf108f9f70700030f236357fa6e1c35c8b9</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 ebd49cf Update binary flag for rev-upgrade in a separate proc
</span>ebd49cf is described below
<span style='display:block; white-space:pre;color:#808000;'>commit ebd49cf108f9f70700030f236357fa6e1c35c8b9
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Mon May 7 08:36:15 2018 +1000
<span style='display:block; white-space:pre;color:#404040;'> Update binary flag for rev-upgrade in a separate proc
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> This will allow it to be called from elsewhere without doing a
</span><span style='display:block; white-space:pre;color:#404040;'> full rev-upgrade.
</span>---
src/macports1.0/macports.tcl | 60 ++++++++++++++++++++++++++++----------------
1 file changed, 38 insertions(+), 22 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/macports1.0/macports.tcl b/src/macports1.0/macports.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 25d93a3..63e7a26 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/macports1.0/macports.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/macports1.0/macports.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4596,31 +4596,17 @@ proc macports::revupgrade {opts} {
</span> }
##
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Helper function for rev-upgrade. Do not consider this to be part of public
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# API. Use macports::revupgrade instead.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Helper function for rev-upgrade. Sets the 'binary' flag to the appropriate
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# value for files in the registry that don't have it set.
</span> #
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# @param broken_port_counts_name
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# The name of a Tcl array that's being used to store the number of times
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# a port has been rebuilt so far.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# @param opts
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# A serialized version of a Tcl array that contains options for
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# MacPorts. Options used by this method are
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# ports_rev-upgrade_id-loadcmd-check, a boolean indicating whether the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# ID loadcommand of binaries should also be checked during rev-upgrade
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# and ports_dryrun, a boolean indicating whether no action should be
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# taken.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# @return 1 if ports were rebuilt and this function should be called again,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# 0 otherwise.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-proc macports::revupgrade_scanandrebuild {broken_port_counts_name opts} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- upvar $broken_port_counts_name broken_port_counts
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- array set options $opts
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# @param fancy_output
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Boolean, whether to use a progress display callback
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# @param revupgrade_progress
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Progress display callback name
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+proc macports::revupgrade_update_binary {fancy_output {revupgrade_progress ""}} {
</span> set files [registry::file search active 1 binary -null]
set files_count [llength $files]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set fancy_output [expr {![macports::ui_isset ports_debug] && [info exists macports::ui_options(progress_generic)]}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {$fancy_output} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set revupgrade_progress $macports::ui_options(progress_generic)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if {$files_count > 0} {
registry::write {
try {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4674,6 +4660,36 @@ proc macports::revupgrade_scanandrebuild {broken_port_counts_name opts} {
</span> $revupgrade_progress finish
}
}
<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;'>+##
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Helper function for rev-upgrade. Do not consider this to be part of public
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# API. Use macports::revupgrade instead.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# @param broken_port_counts_name
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# The name of a Tcl array that's being used to store the number of times
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# a port has been rebuilt so far.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# @param opts
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# A serialized version of a Tcl array that contains options for
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# MacPorts. Options used by this method are
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# ports_rev-upgrade_id-loadcmd-check, a boolean indicating whether the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# ID loadcommand of binaries should also be checked during rev-upgrade
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# and ports_dryrun, a boolean indicating whether no action should be
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# taken.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# @return 1 if ports were rebuilt and this function should be called again,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# 0 otherwise.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+proc macports::revupgrade_scanandrebuild {broken_port_counts_name opts} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ upvar $broken_port_counts_name broken_port_counts
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ array set options $opts
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set fancy_output [expr {![macports::ui_isset ports_debug] && [info exists macports::ui_options(progress_generic)]}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {$fancy_output} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set revupgrade_progress $macports::ui_options(progress_generic)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set revupgrade_progress ""
</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;'>+ revupgrade_update_binary $fancy_output $revupgrade_progress
</span>
set maybe_cxx_ports [registry::entry search state installed cxx_stdlib -null]
set maybe_cxx_len [llength $maybe_cxx_ports]
</pre><pre style='margin:0'>
</pre>