<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/5cdf096b9dcfdcb0dbee1634ad6d37d9b898ef84">https://github.com/macports/macports-base/commit/5cdf096b9dcfdcb0dbee1634ad6d37d9b898ef84</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 5cdf096b9dcfdcb0dbee1634ad6d37d9b898ef84
</span>Author: umeshksingla <umeshksingla@macports.org>
AuthorDate: Tue Oct 15 22:31:15 2019 +0200
<span style='display:block; white-space:pre;color:#404040;'> Remove code for handling inactive ports
</span>---
src/macports1.0/restore.tcl | 35 +++++++++--------------------------
1 file changed, 9 insertions(+), 26 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 8eea4a6..08c182c 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;'>@@ -176,10 +176,6 @@ namespace eval restore {
</span>
set name [lindex $port 0]
set requested [lindex $port 1]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set active 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[lindex $port 2] eq "installed"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set active 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> set variantstr [lindex $port 3]
if {$variantstr eq "(null)"} {
set variantstr ""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -214,7 +210,7 @@ namespace eval restore {
</span> if {![info exists port_deps(${name},${variants})]} {
set port_deps(${name},${variants}) [sort_portlist_dependencies_first_helper $name $variants]
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend new_list [list $name $requested $variants $active]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend new_list [list $name $requested $variants]
</span> }
set operation_list [list]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -222,12 +218,9 @@ namespace eval restore {
</span>
set oldLen [llength $new_list]
foreach port $new_list {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach {name requested variants active} $port break
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach {name requested variants} $port break
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Ensure active versions are installed after inactive versions.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Skip this port if it is active and all the inactive versions have
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # not been added to the operation_list.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {$active && $port_installed($name) < ($port_in_list($name) - 1)} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {$port_installed($name) < ($port_in_list($name) - 1)} {
</span> continue
}
set installable 1
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -238,9 +231,9 @@ namespace eval restore {
</span> }
}
if {$installable} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend operation_list [list $name $requested $variants $active]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend operation_list [list $name $requested $variants]
</span> incr port_installed($name)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set index [lsearch $new_list [list $name $requested $variants $active]]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set index [lsearch $new_list [list $name $requested $variants]]
</span> set new_list [lreplace $new_list $index $index]
}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -290,11 +283,7 @@ namespace eval restore {
</span> set requested [lindex $port 1]
if {$requested} {
# Hide unrequested ports
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[lindex $port 2] eq "installed"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_msg " [lindex $port 0] [lindex $port 3]"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_msg " [lindex $port 0] [lindex $port 3] (inactive)"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</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:#e0e0e0;'>@@ -305,15 +294,9 @@ namespace eval restore {
</span> set name [string trim [lindex $port 0]]
set requested [lindex $port 1]
set variants [lindex $port 2]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set active [lindex $port 3]
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {!$active} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set target install
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_msg "Installing (not activating): $name $variants"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set target activate
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_msg "Installing (and activating): $name $variants"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set target activate
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_msg "Installing (and activating): $name $variants"
</span>
if {[catch {set res [mportlookup $name]} result]} {
global errorInfo
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -341,7 +324,7 @@ namespace eval restore {
</span> global errorInfo
mportclose $workername
ui_error "$errorInfo"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return -code error "Unable to execute target 'install' for port '$name': $result"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -code error "Unable to execute target '$target' for port '$name': $result"
</span> } else {
mportclose $workername
}
</pre><pre style='margin:0'>
</pre>