<pre style='margin:0'>
Umesh Singla (umeshksingla) pushed a commit to branch gsoc17-migrate
in repository macports-base.
</pre>
<p><a href="https://github.com/macports/macports-base/commit/520a0e1c267f926ad4a7cc7eff020a2fc9ee789b">https://github.com/macports/macports-base/commit/520a0e1c267f926ad4a7cc7eff020a2fc9ee789b</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 520a0e1c267f926ad4a7cc7eff020a2fc9ee789b
</span>Author: Clemens Lang <cal@macports.org>
AuthorDate: Sun Mar 11 21:46:00 2018 +0100
<span style='display:block; white-space:pre;color:#404040;'> restore: Display list of requested ports before restoring
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> The previous output was not very human-readable and sorted in dependency
</span><span style='display:block; white-space:pre;color:#404040;'> order. Dependency order is very unintuitive for humans to read.
</span>---
src/macports1.0/restore.tcl | 19 ++++++++++++++++---
1 file changed, 16 insertions(+), 3 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/macports1.0/restore.tcl b/src/macports1.0/restore.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index fdcdf13..d9561ef 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/macports1.0/restore.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/macports1.0/restore.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -290,12 +290,25 @@ namespace eval restore {
</span> }
proc restore_state {snapshot_portlist} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set sorted_snapshot_portlist [portlist_sort_dependencies_first $snapshot_portlist]
</span> ui_msg "Installing ports:"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach port $sorted_snapshot_portlist {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_msg " $port"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set snapshot_portlist [lsort -index 0 -nocase $snapshot_portlist]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach port $snapshot_portlist {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # 0: port name
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # 1: requested (0/1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # 2: state (imaged/installed, i.e. inactive/active)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # 3: variants
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[lindex $port 1] == 1} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Hide unrequested ports
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[lindex $port 2] eq "installed"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_msg " [lindex $port 0] [lindex $port 3]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_msg " [lindex $port 0] [lindex $port 3] (inactive)"
</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;'>+ set sorted_snapshot_portlist [portlist_sort_dependencies_first $snapshot_portlist]
</span> foreach port $sorted_snapshot_portlist {
set name [string trim [lindex $port 0]]
</pre><pre style='margin:0'>
</pre>