<pre style='margin:0'>
Mojca Miklavec (mojca) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/1a661632cdbcbb9fde167ab75c25e66a615dc3cc">https://github.com/macports/macports-ports/commit/1a661632cdbcbb9fde167ab75c25e66a615dc3cc</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 1a66163 mpstats: include requested port information
</span>1a66163 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 1a661632cdbcbb9fde167ab75c25e66a615dc3cc
</span>Author: Mojca Miklavec <mojca@macports.org>
AuthorDate: Sat Mar 17 15:04:00 2018 +0100
<span style='display:block; white-space:pre;color:#404040;'> mpstats: include requested port information
</span>---
sysutils/mpstats/Portfile | 2 +-
sysutils/mpstats/files/mpstats.tcl | 20 +++++++++++++++-----
2 files changed, 16 insertions(+), 6 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/mpstats/Portfile b/sysutils/mpstats/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9d67a2d..a8ade9f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/mpstats/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/mpstats/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span> PortSystem 1.0
name mpstats
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 0.1.6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 0.1.7
</span> categories sysutils macports
license BSD
platforms darwin
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/mpstats/files/mpstats.tcl b/sysutils/mpstats/files/mpstats.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 0d69fa6..7a12cf0 100755
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/mpstats/files/mpstats.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/mpstats/files/mpstats.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -204,7 +204,7 @@ proc json_encode_port {port_info {indent ""}} {
</span> set first true
set json "\{"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach name {name version variants} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach name {name version requested variants} {
</span> # Skip empty strings
if {$port($name) eq ""} {
continue
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -319,8 +319,8 @@ proc split_variants {variants} {
</span> # collection of inactive ports
# @returns
# a list of installed ports chosen according to the \a active parameter, where each entry is
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# the list representation of a Tcl array with the keys name, version and variants. The
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# variants value is encoded using \c split_variants, the version entry has the form
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# the list representation of a Tcl array with the keys name, version, requested and variants.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# The variants value is encoded using \c split_variants, the version entry has the form
</span> # "$version_$revision".
proc get_installed_ports {active} {
set ilist {}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -339,8 +339,18 @@ proc get_installed_ports {active} {
</span> set iname [lindex $i 0]
set iversion [lindex $i 1]
set irevision [lindex $i 2]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set ivariants [split_variants [lindex $i 3]]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend results [list name $iname version "${iversion}_${irevision}" variants $ivariants]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set ivariants [lindex $i 3]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set iepoch [lindex $i 5]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set regref [registry::open_entry $iname $iversion $irevision $ivariants $iepoch]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[registry::property_retrieve $regref "requested"]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set irequested "true"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set irequested ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set ivariantlist [split_variants $ivariants]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend results [list name $iname version "${iversion}_${irevision}" requested $irequested variants $ivariantlist]
</span> }
}
</pre><pre style='margin:0'>
</pre>