<pre style='margin:0'>
Kurt Hindenburg (kurthindenburg) pushed a commit to branch master
in repository macports-base.
</pre>
<p><a href="https://github.com/macports/macports-base/commit/d9139328fa414edaa29d993bc1801dea904f3f10">https://github.com/macports/macports-base/commit/d9139328fa414edaa29d993bc1801dea904f3f10</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 d913932 Abort when a port includes a nonexistent PortGroup (#169)
</span>d913932 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit d9139328fa414edaa29d993bc1801dea904f3f10
</span>Author: Kurt Hindenburg <kurt.hindenburg@gmail.com>
AuthorDate: Fri Apr 24 10:53:54 2020 -0400
<span style='display:block; white-space:pre;color:#404040;'> Abort when a port includes a nonexistent PortGroup (#169)
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * Abort when a port includes an invalid PortGroup
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Currently, only a warning is printed and the processing of the port
</span><span style='display:block; white-space:pre;color:#404040;'> continues. This typically results in a port not completing later.
</span><span style='display:block; white-space:pre;color:#404040;'> After this patch, an error is printed with the port name added and
</span><span style='display:block; white-space:pre;color:#404040;'> then the port processing aborts.
</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/59787
</span>---
src/port1.0/portutil.tcl | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/port1.0/portutil.tcl b/src/port1.0/portutil.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index ce3423d..5c45d20 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/port1.0/portutil.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/port1.0/portutil.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2558,7 +2558,7 @@ proc set_ui_prefix {} {
</span>
# Use a specified group/version.
proc PortGroup {group version} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- global porturl PortInfo _portgroup_search_dirs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global porturl PortInfo _portgroup_search_dirs subport
</span>
if {[info exists _portgroup_search_dirs]} {
foreach dir $_portgroup_search_dirs {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2579,8 +2579,8 @@ proc PortGroup {group version} {
</span> uplevel "source $groupFile"
ui_debug "Sourcing PortGroup $group $version from $groupFile"
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend PortInfo(portgroups) [list $group $version ""]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_warn "PortGroup ${group} ${version} could not be located. ${group}-${version}.tcl does not exist."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "${subport}: PortGroup ${group} ${version} could not be located. ${group}-${version}.tcl does not exist."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -code error "PortGroup not found"
</span> }
}
</pre><pre style='margin:0'>
</pre>