<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/3a7471b6afde992f063443a40ccf02c9068edc85">https://github.com/macports/macports-base/commit/3a7471b6afde992f063443a40ccf02c9068edc85</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 3a7471b6afde992f063443a40ccf02c9068edc85
</span>Author: umeshksingla <umeshksingla@macports.org>
AuthorDate: Tue Oct 15 20:47:57 2019 +0200
<span style='display:block; white-space:pre;color:#404040;'> Change puts stderr to ui_error
</span>---
src/macports1.0/restore.tcl | 11 +++++------
1 file changed, 5 insertions(+), 6 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 8c868be..8eea4a6 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;'>@@ -61,7 +61,6 @@ namespace eval restore {
</span>
if {[info exists options(ports_restore_snapshot-id)]} {
# use the specified snapshot
<span style='display:block; white-space:pre;background:#ffe0e0;'>- puts "snapshotid : $options(ports_restore_snapshot-id)"
</span> set snapshot_id $options(ports_restore_snapshot-id)
set snapshot [registry::snapshot get_by_id $snapshot_id]
ui_msg "Deactivating all ports installed.."
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -262,7 +261,7 @@ namespace eval restore {
</span> array set portinfo [lindex $port_search_result 1]
if {[catch {set mport [mportopen $portinfo(porturl) [list subport $portinfo(name)] $variant_info]} result]} {
global errorInfo
<span style='display:block; white-space:pre;background:#ffe0e0;'>- puts stderr "$errorInfo"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "$errorInfo"
</span> return -code error "Unable to open port '$portname': $result"
}
array unset portinfo
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -310,10 +309,10 @@ namespace eval restore {
</span>
if {!$active} {
set target install
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_msg "Installing (not activating): $name $variants $requested"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_msg "Installing (not activating): $name $variants"
</span> } else {
set target activate
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_msg "Installing (and activating): $name $variants $requested"
</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]} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -334,14 +333,14 @@ namespace eval restore {
</span>
if {[catch {set workername [mportopen $porturl [array get options] $variants]} result]} {
global errorInfo
<span style='display:block; white-space:pre;background:#ffe0e0;'>- puts stderr "$errorInfo"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "$errorInfo"
</span> return -code error "Unable to open port '$name': $result"
}
if {[catch {set result [mportexec $workername $target]} result]} {
global errorInfo
mportclose $workername
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_msg "$errorInfo"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "$errorInfo"
</span> return -code error "Unable to execute target 'install' for port '$name': $result"
} else {
mportclose $workername
</pre><pre style='margin:0'>
</pre>