[64641] trunk/base
jmr at macports.org
jmr at macports.org
Fri Mar 12 09:52:56 PST 2010
Revision: 64641
http://trac.macports.org/changeset/64641
Author: jmr at macports.org
Date: 2010-03-12 09:52:53 -0800 (Fri, 12 Mar 2010)
Log Message:
-----------
fix multiple portuninstall namespace confusion
Modified Paths:
--------------
trunk/base/portmgr/packaging/dpkgall.tcl
trunk/base/src/macports1.0/macports.tcl
trunk/base/src/port/port.tcl
trunk/base/src/registry2.0/portuninstall.tcl
trunk/base/src/registry2.0/registry.tcl
Modified: trunk/base/portmgr/packaging/dpkgall.tcl
===================================================================
--- trunk/base/portmgr/packaging/dpkgall.tcl 2010-03-12 16:47:29 UTC (rev 64640)
+++ trunk/base/portmgr/packaging/dpkgall.tcl 2010-03-12 17:52:53 UTC (rev 64641)
@@ -704,7 +704,7 @@
set port [lindex $portlist 0]
ui_msg "Uninstalling $port."
- if { [catch {portuninstall::uninstall $portname $portversion} result] } {
+ if { [catch {registry_uninstall::uninstall $portname $portversion} result] } {
global errorInfo
ui_debug "$errorInfo"
ui_noisy_errorr "Fatal error: Uninstalling $port failed: $result"
Modified: trunk/base/src/macports1.0/macports.tcl
===================================================================
--- trunk/base/src/macports1.0/macports.tcl 2010-03-12 16:47:29 UTC (rev 64640)
+++ trunk/base/src/macports1.0/macports.tcl 2010-03-12 17:52:53 UTC (rev 64641)
@@ -989,7 +989,7 @@
$workername alias registry_exists_for_name registry::entry_exists_for_name
$workername alias registry_activate portimage::activate
$workername alias registry_deactivate portimage::deactivate
- $workername alias registry_uninstall portuninstall::uninstall
+ $workername alias registry_uninstall registry_uninstall::uninstall
$workername alias registry_register_deps registry::register_dependencies
$workername alias registry_fileinfo_for_index registry::fileinfo_for_index
$workername alias registry_bulk_register_files registry::register_bulk_files
@@ -2886,7 +2886,8 @@
set options(ports_force) yes
if {$is_dryrun eq "yes"} {
ui_msg "Skipping uninstall $portname @${version_installed}_${revision_installed}${variant_installed} (dry run)"
- } elseif {[catch {portuninstall::uninstall $portname ${version_installed}_${revision_installed}${variant_installed} [array get options]} result]} {
+ # XXX need to use mportopen_installed and mportexec here (and below) instead
+ } elseif {[catch {registry_uninstall::uninstall $portname ${version_installed}_${revision_installed}${variant_installed} [array get options]} result]} {
global errorInfo
ui_debug "$errorInfo"
ui_error "Uninstall $portname ${version_installed}_${revision_installed}${variant_installed} failed: $result"
@@ -2906,7 +2907,7 @@
set options(ports_force) yes
if {$is_dryrun eq "yes"} {
ui_msg "Skipping uninstall $newname @${version_in_tree}_${revision_in_tree}$portinfo(canonical_active_variants) (dry run)"
- } elseif {[catch {portuninstall::uninstall $newname ${version_in_tree}_${revision_in_tree}$portinfo(canonical_active_variants) [array get options]} result]} {
+ } elseif {[catch {registry_uninstall::uninstall $newname ${version_in_tree}_${revision_in_tree}$portinfo(canonical_active_variants) [array get options]} result]} {
global errorInfo
ui_debug "$errorInfo"
ui_error "Uninstall $newname ${version_in_tree}_${revision_in_tree}$portinfo(canonical_active_variants) failed: $result"
@@ -2983,7 +2984,7 @@
ui_debug "Uninstalling $portname ${version}_${revision}${variant}"
if {$is_dryrun eq "yes"} {
ui_msg "Skipping uninstall $portname @${version}_${revision}${variant} (dry run)"
- } elseif {[catch {portuninstall::uninstall $portname ${version}_${revision}${variant} $optionslist} result]} {
+ } elseif {[catch {registry_uninstall::uninstall $portname ${version}_${revision}${variant} $optionslist} result]} {
global errorInfo
ui_debug "$errorInfo"
# replaced_by can mean that we try to uninstall all versions of the old port, so handle errors due to dependents
Modified: trunk/base/src/port/port.tcl
===================================================================
--- trunk/base/src/port/port.tcl 2010-03-12 16:47:29 UTC (rev 64640)
+++ trunk/base/src/port/port.tcl 2010-03-12 17:52:53 UTC (rev 64641)
@@ -2313,7 +2313,7 @@
}
}
- if { [catch {portuninstall::uninstall $portname $composite_version [array get options]} result] } {
+ if { [catch {registry_uninstall::uninstall $portname $composite_version [array get options]} result] } {
global errorInfo
ui_debug "$errorInfo"
break_softcontinue "port uninstall failed: $result" 1 status
Modified: trunk/base/src/registry2.0/portuninstall.tcl
===================================================================
--- trunk/base/src/registry2.0/portuninstall.tcl 2010-03-12 16:47:29 UTC (rev 64640)
+++ trunk/base/src/registry2.0/portuninstall.tcl 2010-03-12 17:52:53 UTC (rev 64641)
@@ -30,7 +30,7 @@
# POSSIBILITY OF SUCH DAMAGE.
#
-package provide portuninstall 2.0
+package provide registry_uninstall 2.0
package require registry 1.0
package require registry2 2.0
@@ -38,7 +38,7 @@
set UI_PREFIX "---> "
-namespace eval portuninstall {
+namespace eval registry_uninstall {
proc uninstall {portname {v ""} optionslist} {
global uninstall.force uninstall.nochecksum UI_PREFIX \
@@ -128,7 +128,7 @@
if {[registry::entry exists $depport] && ([$depport state] == "imaged" || [$depport state] == "installed")} {
set depname [$depport name]
set depver "[$depport version]_[$depport revision][$depport variants]"
- portuninstall::uninstall $depname $depver [array get options]
+ registry_uninstall::uninstall $depname $depver [array get options]
}
}
} else {
@@ -175,7 +175,7 @@
foreach depport $dl {
# make sure it's still installed, since a previous dep uninstall may have removed it
if {[registry::entry_exists_for_name $depport]} {
- portuninstall::uninstall $depport "" [array get options]
+ registry_uninstall::uninstall $depport "" [array get options]
}
}
} else {
@@ -339,5 +339,5 @@
}
}
-# End of portuninstall namespace
+# End of registry_uninstall namespace
}
Modified: trunk/base/src/registry2.0/registry.tcl
===================================================================
--- trunk/base/src/registry2.0/registry.tcl 2010-03-12 16:47:29 UTC (rev 64640)
+++ trunk/base/src/registry2.0/registry.tcl 2010-03-12 17:52:53 UTC (rev 64641)
@@ -35,7 +35,7 @@
package require receipt_flat 1.0
package require receipt_sqlite 1.0
package require portimage 2.0
-package require portuninstall 2.0
+package require registry_uninstall 2.0
package require msgcat
namespace eval registry {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100312/ecdbbec4/attachment.html>
More information about the macports-changes
mailing list