<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/962726d897ab570038ec92f5420516831b566e0d">https://github.com/macports/macports-base/commit/962726d897ab570038ec92f5420516831b566e0d</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 962726d port1.0: Store port group path in PortInfo
</span>962726d is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 962726d897ab570038ec92f5420516831b566e0d
</span>Author: Rainer Müller <raimue@macports.org>
AuthorDate: Mon Mar 26 03:22:51 2018 +0200
<span style='display:block; white-space:pre;color:#404040;'> port1.0: Store port group path in PortInfo
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Store the path of port group files in PortInfo, so portinstall does not
</span><span style='display:block; white-space:pre;color:#404040;'> have to repeat the lookup.
</span>---
src/port1.0/portinstall.tcl | 2 +-
src/port1.0/portutil.tcl | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/port1.0/portinstall.tcl b/src/port1.0/portinstall.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index a288bd6..0f1c8f7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/port1.0/portinstall.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/port1.0/portinstall.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -433,7 +433,7 @@ proc portinstall::install_main {args} {
</span> foreach pg $PortInfo(portgroups) {
set pgname [lindex $pg 0]
set pgversion [lindex $pg 1]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set groupFile [getportresourcepath $porturl "port1.0/group/${pgname}-${pgversion}.tcl"]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set groupFile [lindex $pg 2]
</span> if {[file isfile $groupFile]} {
set pgsha256 [sha256 file $groupFile]
set pgsize [file size $groupFile]
<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 f8b035b..3573666 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;'>@@ -2510,12 +2510,11 @@ proc set_ui_prefix {} {
</span> proc PortGroup {group version} {
global porturl PortInfo _portgroup_search_dirs
<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;'>-
</span> if {[info exists _portgroup_search_dirs]} {
foreach dir $_portgroup_search_dirs {
set groupFile ${dir}/${group}-${version}.tcl
if {[file exists $groupFile]} {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend PortInfo(portgroups) [list $group $version $groupFile]
</span> uplevel "source $groupFile"
ui_debug "Sourcing PortGroup $group $version from $groupFile"
return
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2526,9 +2525,11 @@ proc PortGroup {group version} {
</span> set groupFile [getportresourcepath $porturl "port1.0/group/${group}-${version}.tcl"]
if {[file exists $groupFile]} {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend PortInfo(portgroups) [list $group $version $groupFile]
</span> uplevel "source $groupFile"
ui_debug "Sourcing PortGroup $group $version from $groupFile"
} else {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend PortInfo(portgroups) [list $group $version ""]
</span> ui_warn "PortGroup ${group} ${version} could not be located. ${group}-${version}.tcl does not exist."
}
}
</pre><pre style='margin:0'>
</pre>