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

fix multiple portuninstall namespace confusion

File:
1 edited

Legend:

Unmodified
Added
Removed
  • 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"
Note: See TracChangeset for help on using the changeset viewer.