<pre style='margin:0'>
Clemens Lang (neverpanic) pushed a commit to branch gsoc17-migrate
in repository macports-base.
</pre>
<p><a href="https://github.com/macports/macports-base/commit/97934cbc7dd56d73adb4d7955e00007ffde18232">https://github.com/macports/macports-base/commit/97934cbc7dd56d73adb4d7955e00007ffde18232</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 97934cbc7dd56d73adb4d7955e00007ffde18232
</span>Author: Umesh Singla <umeshksingla@macports.org>
AuthorDate: Sat Aug 5 01:42:25 2017 +0530
<span style='display:block; white-space:pre;color:#404040;'> remove unused VERSION variable
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> we don't have version dependencies so it is redundant while
</span><span style='display:block; white-space:pre;color:#404040;'> installing
</span>---
src/macports1.0/migrate.tcl | 21 +++++++++++----------
1 file changed, 11 insertions(+), 10 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/macports1.0/migrate.tcl b/src/macports1.0/migrate.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 357a27f..3705427 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/macports1.0/migrate.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/macports1.0/migrate.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -77,7 +77,7 @@ namespace eval migrate {
</span> #puts [lindex $port 0]
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- uninstall_installed $portlist
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #uninstall_installed $portlist
</span> return 0
# sort_ports $portlist
# recover_ports_state $portlist
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -114,7 +114,7 @@ namespace eval migrate {
</span> return $dependencyList
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- proc sort_ports {portlist} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ proc portlist_sort_dependencies_first {portlist} {
</span>
array set port_installed {}
array set port_deps {}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -128,7 +128,6 @@ namespace eval migrate {
</span> #puts $port
set name [$port name]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set version [$port version]
</span> set variants [$port variants]
set active 0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -136,7 +135,7 @@ namespace eval migrate {
</span> set active 1
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- #puts "$name $version $variants $active"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #puts "$name $variants $active"
</span>
if {![info exists port_in_list($name)]} {
set port_in_list($name) 1
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -197,7 +196,7 @@ namespace eval migrate {
</span> return $operationList
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- proc portlist_sortdependents { portlist } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ proc portlist_sort_dependencies_later { portlist } {
</span>
# Sorts a list of port references such that dependents come before
# their dependencies.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -223,12 +222,12 @@ namespace eval migrate {
</span> }
set ret {}
foreach port $portlist {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- portlist_sortdependents_helper $port entries dependents seen ret
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ portlist_sort_dependencies_later_helper $port entries dependents seen ret
</span> }
return $ret
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- proc portlist_sortdependents_helper {port up_entries up_dependents up_seen up_retlist} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ proc portlist_sort_dependencies_later_helper {port up_entries up_dependents up_seen up_retlist} {
</span> upvar 1 $up_seen seen
if {![info exists seen($port)]} {
set seen($port) 1
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -237,7 +236,7 @@ namespace eval migrate {
</span> foreach dependent $dependents($pvals(name)) {
if {[info exists entries($dependent)]} {
foreach entry $entries($dependent) {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- portlist_sortdependents_helper $entry entries dependents seen retlist
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ portlist_sort_dependencies_later_helper $entry entries dependents seen retlist
</span> }
}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -247,7 +246,7 @@ namespace eval migrate {
</span>
proc uninstall_installed { portlist } {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set portlist [portlist_sortdependents $portlist]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set portlist [portlist_sort_dependencies_later $portlist]
</span>
foreach port $portlist {
puts "[$port name] [$port state]"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -281,8 +280,10 @@ namespace eval migrate {
</span> }
proc recover_ports_state {portList} {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set sorted_portlist [portlist_sort_dependencies_first $portList]
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach port $portList {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach port $sorted_portlist {
</span>
set name [string trim [lindex $port 0]]
set variations [lindex $port 1]
</pre><pre style='margin:0'>
</pre>