Changeset 64641 for trunk


Ignore:
Timestamp:
Mar 12, 2010, 5:52:53 PM (11 years ago)
Author:
jmr@…
Message:

fix multiple portuninstall namespace confusion

Location:
trunk/base
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/base/portmgr/packaging/dpkgall.tcl

    r59836 r64641  
    705705
    706706                        ui_msg "Uninstalling $port."
    707                         if { [catch {portuninstall::uninstall $portname $portversion} result] } {
     707                        if { [catch {registry_uninstall::uninstall $portname $portversion} result] } {
    708708                                global errorInfo
    709709                                ui_debug "$errorInfo"
  • trunk/base/src/macports1.0/macports.tcl

    r64639 r64641  
    990990    $workername alias registry_activate portimage::activate
    991991    $workername alias registry_deactivate portimage::deactivate
    992     $workername alias registry_uninstall portuninstall::uninstall
     992    $workername alias registry_uninstall registry_uninstall::uninstall
    993993    $workername alias registry_register_deps registry::register_dependencies
    994994    $workername alias registry_fileinfo_for_index registry::fileinfo_for_index
     
    28872887        if {$is_dryrun eq "yes"} {
    28882888            ui_msg "Skipping uninstall $portname @${version_installed}_${revision_installed}${variant_installed} (dry run)"
    2889         } elseif {[catch {portuninstall::uninstall $portname ${version_installed}_${revision_installed}${variant_installed} [array get options]} result]} {
     2889            # XXX need to use mportopen_installed and mportexec here (and below) instead
     2890        } elseif {[catch {registry_uninstall::uninstall $portname ${version_installed}_${revision_installed}${variant_installed} [array get options]} result]} {
    28902891            global errorInfo
    28912892            ui_debug "$errorInfo"
     
    29072908            if {$is_dryrun eq "yes"} {
    29082909                ui_msg "Skipping uninstall $newname @${version_in_tree}_${revision_in_tree}$portinfo(canonical_active_variants) (dry run)"
    2909             } elseif {[catch {portuninstall::uninstall $newname ${version_in_tree}_${revision_in_tree}$portinfo(canonical_active_variants) [array get options]} result]} {
     2910            } elseif {[catch {registry_uninstall::uninstall $newname ${version_in_tree}_${revision_in_tree}$portinfo(canonical_active_variants) [array get options]} result]} {
    29102911                global errorInfo
    29112912                ui_debug "$errorInfo"
     
    29842985            if {$is_dryrun eq "yes"} {
    29852986                ui_msg "Skipping uninstall $portname @${version}_${revision}${variant} (dry run)"
    2986             } elseif {[catch {portuninstall::uninstall $portname ${version}_${revision}${variant} $optionslist} result]} {
     2987            } elseif {[catch {registry_uninstall::uninstall $portname ${version}_${revision}${variant} $optionslist} result]} {
    29872988                global errorInfo
    29882989                ui_debug "$errorInfo"
  • trunk/base/src/port/port.tcl

    r64638 r64641  
    23142314        }
    23152315
    2316         if { [catch {portuninstall::uninstall $portname $composite_version [array get options]} result] } {
     2316        if { [catch {registry_uninstall::uninstall $portname $composite_version [array get options]} result] } {
    23172317            global errorInfo
    23182318            ui_debug "$errorInfo"
  • trunk/base/src/registry2.0/portuninstall.tcl

    r64640 r64641  
    3131#
    3232
    33 package provide portuninstall 2.0
     33package provide registry_uninstall 2.0
    3434
    3535package require registry 1.0
     
    3939set UI_PREFIX "---> "
    4040
    41 namespace eval portuninstall {
     41namespace eval registry_uninstall {
    4242
    4343proc uninstall {portname {v ""} optionslist} {
     
    129129                    set depname [$depport name]
    130130                    set depver "[$depport version]_[$depport revision][$depport variants]"
    131                     portuninstall::uninstall $depname $depver [array get options]
     131                    registry_uninstall::uninstall $depname $depver [array get options]
    132132                }
    133133            }
     
    176176                        # make sure it's still installed, since a previous dep uninstall may have removed it
    177177                        if {[registry::entry_exists_for_name $depport]} {
    178                             portuninstall::uninstall $depport "" [array get options]
     178                            registry_uninstall::uninstall $depport "" [array get options]
    179179                        }
    180180                    }
     
    340340}
    341341
    342 # End of portuninstall namespace
     342# End of registry_uninstall namespace
    343343}
  • trunk/base/src/registry2.0/registry.tcl

    r64587 r64641  
    3636package require receipt_sqlite 1.0
    3737package require portimage 2.0
    38 package require portuninstall 2.0
     38package require registry_uninstall 2.0
    3939package require msgcat
    4040
Note: See TracChangeset for help on using the changeset viewer.