<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/775a737390474a041d06bee293e40f6a8375708d">https://github.com/macports/macports-base/commit/775a737390474a041d06bee293e40f6a8375708d</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 775a737390474a041d06bee293e40f6a8375708d
</span>Author: Umesh Singla <umeshksingla@macports.org>
AuthorDate: Mon Jul 17 22:03:25 2017 +0530
<span style='display:block; white-space:pre;color:#404040;'> Run only the install target
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Run only the install targets for ports that were inactive before
</span><span style='display:block; white-space:pre;color:#404040;'> and activate for rest, as Josh suggested.
</span>---
src/macports1.0/restore.tcl | 11 +++++++++--
1 file changed, 9 insertions(+), 2 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 580033e..49628b9 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;'>@@ -139,6 +139,13 @@ namespace eval restore {
</span>
set name [string trim [lindex $port 0]]
set variations [lindex $port 1]
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ set active [lindex $port 2]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {$active} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set target install
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set target activate
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
array unset portinfo
array set portinfo [lindex $res 1]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -149,7 +156,7 @@ namespace eval restore {
</span> set workername [mportopen $porturl [list subport $portinfo(name)] $variations]
# TODO: instead of mportexec, lookup for some API?
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[catch {set result [mportexec $workername install]} result]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[catch {set result [mportexec $workername $target]} result]} {
</span> global errorInfo
mportclose $workername
ui_msg "$errorInfo"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -158,7 +165,7 @@ namespace eval restore {
</span> mportclose $workername
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # port will be active here
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # TODO: deps active?
</span> }
}
</pre><pre style='margin:0'>
</pre>