<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/3515cc62b22c4e0a5a8ee41727cfa9da6083edf1">https://github.com/macports/macports-base/commit/3515cc62b22c4e0a5a8ee41727cfa9da6083edf1</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 3515cc6 portindex: Do not exit non-zero on failed ports
</span>3515cc6 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 3515cc62b22c4e0a5a8ee41727cfa9da6083edf1
</span>Author: Rainer Müller <raimue@macports.org>
AuthorDate: Wed Mar 28 15:55:22 2018 +0200
<span style='display:block; white-space:pre;color:#404040;'> portindex: Do not exit non-zero on failed ports
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> The change in 217d852d broke existing use cases, including the portindex
</span><span style='display:block; white-space:pre;color:#404040;'> run in mportsync. Restore the previous behavior by default and only exit
</span><span style='display:block; white-space:pre;color:#404040;'> with a non-zero exit code if requested with the new flag 'portindex -e'.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://github.com/macports/macports-base/pull/64
</span>---
src/port/portindex.tcl | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/port/portindex.tcl b/src/port/portindex.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index dc7610a..8bf5305 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/port/portindex.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/port/portindex.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,6 +8,7 @@ package require Pextlib
</span>
# Globals
set full_reindex 0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+set permit_error 0
</span> set stats(total) 0
set stats(failed) 0
set stats(skipped) 0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,9 +23,10 @@ mportinit ui_options global_options global_variations
</span> # Standard procedures
proc print_usage args {
global argv0
<span style='display:block; white-space:pre;background:#ffe0e0;'>- puts "Usage: $argv0 \[-df\] \[-o output directory\] \[-p plat_ver_arch\] \[directory\]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ puts "Usage: $argv0 \[-dfe\] \[-o output directory\] \[-p plat_ver_arch\] \[directory\]"
</span> puts "-d:\tOutput debugging information"
puts "-f:\tDo a full re-index instead of updating"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ puts "-e:\tExit code indicates if ports failed to parse"
</span> puts "-o:\tOutput all files to specified directory"
puts "-p:\tPretend to be on another platform"
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -205,6 +207,8 @@ for {set i 0} {$i < $argc} {incr i} {
</span> lappend port_options os.platform $os_platform os.major $os_major os.arch $os_arch
} elseif {$arg eq "-f"} { # Completely rebuild index
set full_reindex 1
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif {$arg eq "-e"} { # Non-zero exit code on errors
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set permit_error 1
</span> } else {
puts stderr "Unknown option: $arg"
print_usage
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -301,6 +305,6 @@ puts "\nTotal number of ports parsed:\t$stats(total)\
</span> \nPorts failed:\t\t\t$stats(failed)\
\nUp-to-date ports skipped:\t$stats(skipped)\n"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {$stats(failed) > 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${permit_error} && $stats(failed) > 0} {
</span> exit 1
}
</pre><pre style='margin:0'>
</pre>