<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-base.
</pre>
<p><a href="https://github.com/macports/macports-base/commit/1d43448fd9860fb867e76bea16e66bee483f93de">https://github.com/macports/macports-base/commit/1d43448fd9860fb867e76bea16e66bee483f93de</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 1d43448fd9860fb867e76bea16e66bee483f93de
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Wed Dec 28 22:50:28 2016 +1100
<span style='display:block; white-space:pre;color:#404040;'> Remove use of 'global errorInfo'
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Instead just use the fully-qualified name ::errorInfo.
</span>---
portmgr/autosubmit.tcl | 6 +--
portmgr/packaging/packageall.tcl | 15 ++----
src/macports1.0/macports.tcl | 42 +++++----------
src/macports1.0/macports_dlist.tcl | 3 +-
src/package1.0/portmpkg.tcl | 3 +-
src/port/port.tcl | 104 +++++++++++++------------------------
src/port1.0/portchecksum.tcl | 3 +-
src/port1.0/portlint.tcl | 9 ++--
src/port1.0/portlivecheck.tcl | 3 +-
src/port1.0/portutil.tcl | 15 ++----
src/registry2.0/registry_util.tcl | 6 +--
11 files changed, 70 insertions(+), 139 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/portmgr/autosubmit.tcl b/portmgr/autosubmit.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index cc7cf2a..5f3f6c4 100755
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/portmgr/autosubmit.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/portmgr/autosubmit.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -81,16 +81,14 @@ proc submit_ports {} {
</span> # Open the port
set err 0
if {[catch {set workername [mportopen $porturl [array get submit_options]]} result]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- global errorInfo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "$errorInfo"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug $::errorInfo
</span> puts "Unable to open port: $result"
set err 1
}
# Submit the port
if { !$err && [catch {set result [mportexec $workername submit]} result]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- global errorInfo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "$errorInfo"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug $::errorInfo
</span> puts "Unable to execute port: $result"
set err 1
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/portmgr/packaging/packageall.tcl b/portmgr/packaging/packageall.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 91e4595..38f3751 100755
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/portmgr/packaging/packageall.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/portmgr/packaging/packageall.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -120,8 +120,7 @@ proc get_dependencies {portname includeBuildDeps} {
</span> set result {}
if {[catch {set res [mportsearch "^$portname\$"]} error]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- global errorInfo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "$errorInfo"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug $::errorInfo
</span> ui_error "Internal error: port search failed: $error"
return {}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -179,15 +178,13 @@ proc install_binary_if_available {dep basepath} {
</span> if {[file readable $pkgpath]} {
ui_msg "installing binary: $pkgpath"
if {[catch {system "cd / && gunzip -c ${pkgpath}/Contents/Archive.pax.gz | pax -r"} error]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- global errorInfo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "$errorInfo"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug $::errorInfo
</span> ui_error "Internal error: $error"
}
# Touch the receipt
# xxx: use some variable to describe this path
if {[catch {system "touch /opt/local/var/db/dports/receipts/${portname}-${portversion}.bz2"} error]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- global errorInfo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "$errorInfo"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug $::errorInfo
</span> ui_error "Internal error: $error"
}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -399,15 +396,13 @@ foreach pname $argv {
</span> set options(subport) $name
if {[catch {set workername [mportopen $porturl [array get options] [array get variations] yes]} result] ||
$result == 1} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- global errorInfo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "$errorInfo"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug $::errorInfo
</span> ui_error "Internal error: unable to open port: $result"
continue
}
if {[catch {set result [mportexec $workername pkg]} result] ||
$result == 1} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- global errorInfo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "$errorInfo"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug $::errorInfo
</span> ui_error "port package failed: $result"
mportclose $workername
continue
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/macports1.0/macports.tcl b/src/macports1.0/macports.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index b607c9f..8bf6a12 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/macports1.0/macports.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/macports1.0/macports.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3307,9 +3307,8 @@ proc mportdepends {mport {target {}} {recurseDeps 1} {skipSatisfied 1} {accDeps
</span> try -pass_signal {
set res [mportlookup $dep_portname]
} catch {{*} eCode eMessage} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- global errorInfo
</span> ui_msg {}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug $errorInfo
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug $::errorInfo
</span> ui_error "Internal error: port lookup failed: $eMessage"
return 1
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3640,8 +3639,7 @@ proc macports::_upgrade {portname dspec variationslist optionslist {depscachenam
</span> try {
set result [mportlookup $portname]
} catch {{*} eCode eMessage} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- global errorInfo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug $errorInfo
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug $::errorInfo
</span> ui_error "port lookup failed: $eMessage"
return 1
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3675,8 +3673,7 @@ proc macports::_upgrade {portname dspec variationslist optionslist {depscachenam
</span> upvar 2 variations variations
if {[catch {set mport [mportopen $porturl [array get options] [array get variations]]} result]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- global errorInfo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug $errorInfo
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug $::errorInfo
</span> ui_error "Unable to open port: $result"
return 1
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3692,8 +3689,7 @@ proc macports::_upgrade {portname dspec variationslist optionslist {depscachenam
</span> }
# now install it
if {[catch {set result [mportexec $mport activate]} result]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- global errorInfo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug $errorInfo
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug $::errorInfo
</span> ui_error "Unable to exec port: $result"
catch {mportclose $mport}
return 1
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3833,8 +3829,7 @@ proc macports::_upgrade {portname dspec variationslist optionslist {depscachenam
</span> if {[info exists portinfo(replaced_by)] && ![info exists options(ports_upgrade_no-replace)]} {
ui_msg "$macports::ui_prefix $portname is replaced by $portinfo(replaced_by)"
if {[catch {mportlookup $portinfo(replaced_by)} result]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- global errorInfo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug $errorInfo
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug $::errorInfo
</span> ui_error "port lookup failed: $result"
return 1
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3865,8 +3860,7 @@ proc macports::_upgrade {portname dspec variationslist optionslist {depscachenam
</span> }
if {[catch {set mport [mportopen $porturl [array get interp_options] [array get variations]]} result]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- global errorInfo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug $errorInfo
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug $::errorInfo
</span> ui_error "Unable to open port: $result"
return 1
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4026,8 +4020,7 @@ proc macports::_upgrade {portname dspec variationslist optionslist {depscachenam
</span> ui_msg "Skipping uninstall $newname @${version_in_tree}_${revision_in_tree}$portinfo(canonical_active_variants) (dry run)"
} elseif {![registry::run_target $newregref uninstall [array get options]]
&& [catch {registry_uninstall::uninstall $newname $version_in_tree $revision_in_tree $portinfo(canonical_active_variants) [array get options]} result]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- global errorInfo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug $errorInfo
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug $::errorInfo
</span> ui_error "Uninstall $newname ${version_in_tree}_${revision_in_tree}$portinfo(canonical_active_variants) failed: $result"
catch {mportclose $mport}
return 1
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4050,8 +4043,7 @@ proc macports::_upgrade {portname dspec variationslist optionslist {depscachenam
</span> } elseif {![catch {registry::active $portname}] &&
![registry::run_target $regref deactivate [array get options]]
&& [catch {portimage::deactivate $portname $version_active $revision_active $variant_active [array get options]} result]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- global errorInfo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug $errorInfo
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug $::errorInfo
</span> ui_error "Deactivating $portname @${version_active}_${revision_active}$variant_active failed: $result"
catch {mportclose $mport}
return 1
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4073,8 +4065,7 @@ proc macports::_upgrade {portname dspec variationslist optionslist {depscachenam
</span> }
ui_msg "Skipping activate $newname @${version_in_tree}_${revision_in_tree}$portinfo(canonical_active_variants) (dry run)"
} elseif {[catch {set result [mportexec $mport activate]} result]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- global errorInfo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug $errorInfo
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug $::errorInfo
</span> ui_error "Couldn't activate $newname ${version_in_tree}_${revision_in_tree}$portinfo(canonical_active_variants): $result"
catch {mportclose $mport}
return 1
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4126,8 +4117,7 @@ proc macports::_upgrade {portname dspec variationslist optionslist {depscachenam
</span> ui_msg "Skipping uninstall $portname @${version}_${revision}$variant (dry run)"
} elseif {![registry::run_target $regref uninstall $optionslist]
&& [catch {registry_uninstall::uninstall $portname $version $revision $variant $optionslist} result]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- global errorInfo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug $errorInfo
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug $::errorInfo
</span> # replaced_by can mean that we try to uninstall all versions of the old port, so handle errors due to dependents
if {$result ne "Please uninstall the ports that depend on $portname first." && ![ui_isset ports_processall]} {
ui_error "Uninstall $portname @${version}_${revision}$variant failed: $result"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4215,8 +4205,7 @@ proc mportselect {command {group ""} {version {}}} {
</span> switch -- $command {
list {
if {[catch {set versions [glob -directory $conf_path *]} result]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- global errorInfo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "${result}: $errorInfo"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "${result}: $::errorInfo"
</span> return -code error [concat "No configurations associated" \
"with '$group' were found."]
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4236,8 +4225,7 @@ proc mportselect {command {group ""} {version {}}} {
</span> summary {
# Return the list of portgroups in ${macports::prefix}/etc/select
if {[catch {set lportgroups [glob -directory $conf_path -tails *]} result]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- global errorInfo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "${result}: $errorInfo"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "${result}: $::errorInfo"
</span> return -code error [concat "No ports with the select" \
"option were found."]
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4247,8 +4235,7 @@ proc mportselect {command {group ""} {version {}}} {
</span> # Use ${conf_path}/$version to read in sources.
if {$version eq "" || $version eq "base" || $version eq "current"
|| [catch {set src_file [open "${conf_path}/$version"]} result]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- global errorInfo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "${result}: $errorInfo"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "${result}: $::errorInfo"
</span> return -code error "The specified version '$version' is not valid."
}
set srcs [split [read -nonewline $src_file] \n]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4256,8 +4243,7 @@ proc mportselect {command {group ""} {version {}}} {
</span>
# Use ${conf_path}/base to read in targets.
if {[catch {set tgt_file [open ${conf_path}/base]} result]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- global errorInfo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "${result}: $errorInfo"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "${result}: $::errorInfo"
</span> return -code error [concat "The configuration file" \
"'${conf_path}/base' could not be" \
"opened."]
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/macports1.0/macports_dlist.tcl b/src/macports1.0/macports_dlist.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index f4a3a2a..e5eec12 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/macports1.0/macports_dlist.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/macports1.0/macports_dlist.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -308,8 +308,7 @@ proc dlist_eval {dlist testcond handler {canfail "0"} {selector "dlist_get_next"
</span> # $handler should return a unix status code, 0 for success.
# statusdict notation is 1 for success
if {[catch {{*}$handler $ditem} result]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- global errorInfo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "$errorInfo"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug $::errorInfo
</span> ui_error $result
return $dlist
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/package1.0/portmpkg.tcl b/src/package1.0/portmpkg.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index af8e46c..f56e28b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/package1.0/portmpkg.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/package1.0/portmpkg.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -61,8 +61,7 @@ proc portmpkg::make_dependency_list {portname destination} {
</span> global requested_variations prefix package.destpath package.flat
set result {}
if {[catch {set res [mport_lookup $portname]} error]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- global errorInfo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "$errorInfo"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug $::errorInfo
</span> return -code error "port lookup failed: $error"
}
array set portinfo [lindex $res 1]
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/port/port.tcl b/src/port/port.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 02612a0..aa15125 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/port/port.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/port/port.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -654,8 +654,7 @@ proc unique_results_to_portlist {infos} {
</span>
proc get_matching_ports {pattern {casesensitive no} {matchstyle glob} {field name}} {
if {[catch {set res [mportsearch $pattern $casesensitive $matchstyle $field]} result]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- global errorInfo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "$errorInfo"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug $::errorInfo
</span> fatal "search for portname $pattern failed: $result"
}
set results [unique_results_to_portlist $res]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -670,8 +669,7 @@ proc get_all_ports {} {
</span>
if {![info exists all_ports_cache]} {
if {[catch {set res [mportlistall]} result]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- global errorInfo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "$errorInfo"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug $::errorInfo
</span> fatal "listing all ports failed: $result"
}
set results [unique_results_to_portlist $res]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -706,8 +704,7 @@ proc get_installed_ports { {ignore_active yes} {active yes} } {
</span> set ilist {}
if { [catch {set ilist [registry::installed]} result] } {
if {$result ne "Registry error: No ports registered as installed."} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- global errorInfo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "$errorInfo"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug $::errorInfo
</span> fatal "port installed failed: $result"
}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -781,8 +778,7 @@ proc get_outdated_ports {} {
</span> set ilist {}
if { [catch {set ilist [registry::installed]} result] } {
if {$result ne "Registry error: No ports registered as installed."} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- global errorInfo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "$errorInfo"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug $::errorInfo
</span> fatal "port installed failed: $result"
}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -806,8 +802,7 @@ proc get_outdated_ports {} {
</span>
# Get info about the port from the index
if {[catch {set res [mportlookup $portname]} result]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- global errorInfo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "$errorInfo"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug $::errorInfo
</span> fatal "lookup of portname $portname failed: $result"
}
if {[llength $res] < 2} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -890,8 +885,7 @@ proc get_ports_with_prop {propname propval} {
</span> set ilist {}
if { [catch {set ilist [registry::installed]} result] } {
if {$result ne "Registry error: No ports registered as installed."} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- global errorInfo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "$errorInfo"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug $::errorInfo
</span> fatal "port installed failed: $result"
}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -925,8 +919,7 @@ proc get_leaves_ports {} {
</span> set ilist {}
if { [catch {set ilist [registry::installed]} result] } {
if {$result ne "Registry error: No ports registered as installed."} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- global errorInfo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "$errorInfo"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug $::errorInfo
</span> fatal "port installed failed: $result"
}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2356,8 +2349,7 @@ proc action_location { action portlist opts } {
</span> }
foreachport $portlist {
if { [catch {set ilist [registry_installed $portname [composite_version $portversion [array get variations]]]} result] } {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- global errorInfo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "$errorInfo"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug $::errorInfo
</span> break_softcontinue "port location failed: $result" 1 status
} else {
# set portname again since the one we were passed may not have had the correct case
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2505,8 +2497,7 @@ proc action_activate { action portlist opts } {
</span> }
if {![macports::global_option_isset ports_dryrun]} {
if { [catch {portimage::activate_composite $portname $composite_version [array get options]} result] } {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- global errorInfo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "$errorInfo"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug $::errorInfo
</span> break_softcontinue "port activate failed: $result" 1 status
}
} else {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2542,8 +2533,7 @@ proc action_deactivate { action portlist opts } {
</span> }
if {![macports::global_option_isset ports_dryrun]} {
if { [catch {portimage::deactivate_composite $portname $composite_version [array get options]} result] } {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- global errorInfo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "$errorInfo"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug $::errorInfo
</span> break_softcontinue "port deactivate failed: $result" 1 status
}
} else {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2604,8 +2594,7 @@ proc action_select { action portlist opts } {
</span> }
if {[catch {mportselect show $group} selected_version]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- global errorInfo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug $errorInfo
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug $::errorInfo
</span> ui_warn "Unable to get active selected version: $selected_version"
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2725,9 +2714,8 @@ proc action_selfupdate { action portlist opts } {
</span> return 1
}
if { [catch {macports::selfupdate [array get global_options] base_updated} result ] } {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- global errorInfo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "$errorInfo"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "$result"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug $::errorInfo
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error $result
</span> if {![macports::ui_isset ports_verbose]} {
ui_msg "Please run `port -v selfupdate' for details."
} else {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2763,8 +2751,7 @@ proc action_setrequested { action portlist opts } {
</span> registry::property_store $regref requested $val
}
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- global errorInfo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "$errorInfo"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug $::errorInfo
</span> break_softcontinue "$result" 1 status
}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2861,8 +2848,7 @@ proc action_dependents { action portlist opts } {
</span> foreachport $portlist {
set composite_version [composite_version $portversion [array get variations]]
if { [catch {set ilist [registry::installed $portname $composite_version]} result] } {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- global errorInfo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "$errorInfo"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug $::errorInfo
</span> break_softcontinue "$result" 1 status
} else {
# choose the active version if there is one
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3233,8 +3219,7 @@ proc action_uninstall { action portlist opts } {
</span> }
if { [catch {registry_uninstall::uninstall_composite $portname $composite_version [array get options]} result] } {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- global errorInfo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "$errorInfo"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug $::errorInfo
</span> break_softcontinue "port uninstall failed: $result" 1 status
}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3255,8 +3240,7 @@ proc action_installed { action portlist opts } {
</span> set composite_version [composite_version $portversion [array get variations]]
if { [catch {set ilist [concat $ilist [registry::installed $portname $composite_version]]} result] } {
if {![string match "* not registered as installed." $result]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- global errorInfo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "$errorInfo"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug $::errorInfo
</span> break_softcontinue "port installed failed: $result" 1 status
}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3264,8 +3248,7 @@ proc action_installed { action portlist opts } {
</span> } else {
if { [catch {set ilist [registry::installed]} result] } {
if {$result ne "Registry error: No ports registered as installed."} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- global errorInfo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "$errorInfo"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug $::errorInfo
</span> ui_error "port installed failed: $result"
set status 1
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3332,8 +3315,7 @@ proc action_outdated { action portlist opts } {
</span> set composite_version [composite_version $port(version) $port(variants)]
if { [catch {set ilist [concat $ilist [registry::installed $portname $composite_version]]} result] } {
if {![string match "* not registered as installed." $result]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- global errorInfo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "$errorInfo"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug $::errorInfo
</span> break_softcontinue "port outdated failed: $result" 1 status
}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3341,8 +3323,7 @@ proc action_outdated { action portlist opts } {
</span> } else {
if { [catch {set ilist [registry::installed]} result] } {
if {$result ne "Registry error: No ports registered as installed."} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- global errorInfo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "$errorInfo"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug $::errorInfo
</span> ui_error "port installed failed: $result"
set status 1
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3367,8 +3348,7 @@ proc action_outdated { action portlist opts } {
</span>
# Get info about the port from the index
if {[catch {set res [mportlookup $portname]} result]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- global errorInfo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "$errorInfo"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug $::errorInfo
</span> break_softcontinue "search for portname $portname failed: $result" 1 status
}
if {[llength $res] < 2} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3569,8 +3549,7 @@ proc action_variants { action portlist opts } {
</span> if {$porturl eq ""} {
# look up port
if {[catch {mportlookup $portname} result]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- global errorInfo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "$errorInfo"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug $::errorInfo
</span> break_softcontinue "lookup of portname $portname failed: $result" 1 status
}
if {[llength $result] < 2} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3751,8 +3730,7 @@ proc action_search { action portlist opts } {
</span> set opt [map_friendly_field_names $opt]
if {[catch {set matches [mportsearch $searchstring $filter_case $matchstyle $opt]} result]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- global errorInfo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "$errorInfo"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug $::errorInfo
</span> break_softcontinue "search for name $portname failed: $result" 1 status
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3844,8 +3822,7 @@ proc action_list { action portlist opts } {
</span> foreachport $portlist {
if {$portname eq "-all-"} {
if {[catch {set res [mportlistall]} result]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- global errorInfo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "$errorInfo"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug $::errorInfo
</span> break_softcontinue "listing all ports failed: $result" 1 status
}
} else {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3855,8 +3832,7 @@ proc action_list { action portlist opts } {
</span> }
set search_string [regex_pat_sanitize $portname]
if {[catch {set res [mportsearch ^$search_string\$ no]} result]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- global errorInfo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "$errorInfo"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug $::errorInfo
</span> break_softcontinue "search for portname $search_string failed: $result" 1 status
}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3922,8 +3898,7 @@ proc action_portcmds { action portlist opts } {
</span>
# Verify the portname, getting portinfo to map to a porturl
if {[catch {set res [mportlookup $portname]} result]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- global errorInfo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "$errorInfo"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug $::errorInfo
</span> break_softcontinue "lookup of portname $portname failed: $result" 1 status
}
if {[llength $res] < 2} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3981,8 +3956,7 @@ proc action_portcmds { action portlist opts } {
</span>
# Invoke the editor
if {[catch {exec -ignorestderr >@stdout <@stdin {*}$editor $portfile} result]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- global errorInfo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "$errorInfo"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug $::errorInfo
</span> break_softcontinue "unable to invoke editor $editor: $result" 1 status
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4049,8 +4023,7 @@ proc action_portcmds { action portlist opts } {
</span> # Try to open a browser to the homepage for the given port
if { $homepage ne "" } {
if {[catch {system "${macports::autoconf::open_path} '$homepage'"} result]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- global errorInfo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "$errorInfo"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug $::errorInfo
</span> break_softcontinue "unable to invoke browser using ${macports::autoconf::open_path}: $result" 1 status
}
} else {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4072,8 +4045,7 @@ proc action_sync { action portlist opts } {
</span>
set status 0
if {[catch {mportsync [array get global_options]} result]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- global errorInfo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "$errorInfo"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug $::errorInfo
</span> ui_msg "port sync failed: $result"
set status 1
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4098,8 +4070,7 @@ proc action_target { action portlist opts } {
</span> if {$porturl eq ""} {
# Verify the portname, getting portinfo to map to a porturl
if {[catch {set res [mportlookup $portname]} result]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- global errorInfo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "$errorInfo"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug $::errorInfo
</span> break_softcontinue "lookup of portname $portname failed: $result" 1 status
}
if {[llength $res] < 2} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4154,14 +4125,12 @@ proc action_target { action portlist opts } {
</span> }
}
if {[catch {set workername [mportopen $porturl [array get options] [array get requested_variations]]} result]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- global errorInfo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "$errorInfo"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug $::errorInfo
</span> break_softcontinue "Unable to open port: $result" 1 status
}
if {[catch {set result [mportexec $workername $target]} result]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- global errorInfo
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug $::errorInfo
</span> mportclose $workername
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "$errorInfo"
</span> break_softcontinue "Unable to execute port: $result" 1 status
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4698,8 +4667,7 @@ proc process_cmd { argv } {
</span> # (to avoid abiguity with -variants and a default port, either -- must be
# used to terminate option processing, or the pseudo-port current must be specified).
if {[catch {parse_options $action ui_options global_options} result]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- global errorInfo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "$errorInfo"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug $::errorInfo
</span> ui_error $result
set action_status 1
break
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4776,8 +4744,7 @@ proc complete_portname { text state } {
</span>
# Build a list of ports with text as their prefix
if {[catch {set res [mportsearch "${text}*" false glob]} result]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- global errorInfo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "$errorInfo"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug $::errorInfo
</span> fatal "search for portname $pattern failed: $result"
}
foreach {name info} $res {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5732,8 +5699,7 @@ if { [llength $remaining_args] == 0 && ![info exists ui_options(ports_commandfil
</span> # This must be done following parse of global options, as some options are
# evaluated by mportinit.
if {[catch {mportinit ui_options global_options global_variations} result]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- global errorInfo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts "$errorInfo"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ puts $::errorInfo
</span> fatal "Failed to initialize MacPorts, $result"
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/port1.0/portchecksum.tcl b/src/port1.0/portchecksum.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 327dace..ca0d9e9 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/port1.0/portchecksum.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/port1.0/portchecksum.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -137,8 +137,7 @@ proc portchecksum::parse_checksums {checksums_str} {
</span> }
} error]} {
# An error occurred.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- global errorInfo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "$errorInfo"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug $::errorInfo
</span> ui_error "Couldn't parse checksum line ($checksums_str) [$error]"
# Something wrong happened.
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/port1.0/portlint.tcl b/src/port1.0/portlint.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 68836f6..335ab49 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/port1.0/portlint.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/port1.0/portlint.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -517,8 +517,7 @@ proc portlint::lint_main {args} {
</span> foreach depspec $all_depends {
set dep [lindex [split $depspec :] end]
if {[catch {set res [mport_lookup $dep]} error]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- global errorInfo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "$errorInfo"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug $::errorInfo
</span> continue
}
if {$res eq ""} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -551,8 +550,7 @@ proc portlint::lint_main {args} {
</span> incr errors
} else {
if {[catch {set res [mport_lookup $replaced_by]} error]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- global errorInfo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "$errorInfo"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug $::errorInfo
</span> }
if {$res eq ""} {
ui_error "replaced_by references unknown port: $replaced_by"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -571,8 +569,7 @@ proc portlint::lint_main {args} {
</span> continue
}
if {[catch {set res [mport_lookup $cport]} error]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- global errorInfo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "$errorInfo"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug $::errorInfo
</span> continue
}
if {$res eq ""} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/port1.0/portlivecheck.tcl b/src/port1.0/portlivecheck.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 6f23f5c..8fae97c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/port1.0/portlivecheck.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/port1.0/portlivecheck.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -131,8 +131,7 @@ proc portlivecheck::livecheck_main {args} {
</span> set defaults_file "$types_dir/${livecheck.type}.tcl"
ui_debug "Loading the defaults from '$defaults_file'"
if {[catch {source $defaults_file} result]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- global errorInfo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "$errorInfo: result"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "$::errorInfo: result"
</span> return -code 1 "The defaults could not be loaded from '$defaults_file'."
}
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/port1.0/portutil.tcl b/src/port1.0/portutil.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index f450945..c980d6c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/port1.0/portutil.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/port1.0/portutil.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -972,8 +972,7 @@ proc reinplace {args} {
</span> set file [file join $dir $file]
if {[catch {set tmpfile [mkstemp "${tempdir}/[file tail $file].sed.XXXXXXXX"]} error]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- global errorInfo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "$errorInfo"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug $::errorInfo
</span> ui_error "reinplace: $error"
return -code error "reinplace failed"
} else {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1002,8 +1001,7 @@ proc reinplace {args} {
</span> ui_info "$UI_PREFIX [format [msgcat::mc "Patching %s: %s"] [file tail $file] $pattern]"
ui_debug "Executing reinplace: $cmdline"
if {[catch {exec -ignorestderr -- {*}$cmdline} error]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- global errorInfo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "$errorInfo"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug $::errorInfo
</span> ui_error "reinplace: $error"
file delete "$tmpfile"
if {$locale ne ""} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1031,16 +1029,14 @@ proc reinplace {args} {
</span>
# We need to overwrite this file
if {[catch {file attributes $file -permissions u+w} error]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- global errorInfo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "$errorInfo"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug $::errorInfo
</span> ui_error "reinplace: $error"
file delete "$tmpfile"
return -code error "reinplace permissions failed"
}
if {[catch {file copy -force $tmpfile $file} error]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- global errorInfo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "$errorInfo"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug $::errorInfo
</span> ui_error "reinplace: $error"
file delete "$tmpfile"
return -code error "reinplace copy failed"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1937,8 +1933,7 @@ proc variant_run {ditem} {
</span>
# execute proc with same name as variant.
if {[catch "variant-${name}" result]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- global errorInfo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "$errorInfo"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug $::errorInfo
</span> ui_error "[option name]: Error executing $name: $result"
return 1
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/registry2.0/registry_util.tcl b/src/registry2.0/registry_util.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 6cc3492..c9a35b6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/registry2.0/registry_util.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/registry2.0/registry_util.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -117,8 +117,7 @@ proc run_target {port target options} {
</span>
if {![catch {set mport [mportopen_installed [$port name] [$port version] [$port revision] [$port variants] $options]}]} {
if {[catch {set result [mportexec $mport $target]} result] || $result != 0} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- global errorInfo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "$errorInfo"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug $::errorInfo
</span> catch {mportclose $mport}
ui_warn "Failed to execute portfile from registry for $portspec"
switch $target {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -147,8 +146,7 @@ proc run_target {port target options} {
</span> return 1
}
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- global errorInfo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "$errorInfo"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug $::errorInfo
</span> ui_warn "Failed to open Portfile from registry for $portspec"
}
return 0
</pre><pre style='margin:0'>
</pre>