Ignore:
Timestamp:
Apr 2, 2009, 5:28:01 PM (11 years ago)
Author:
toby@…
Message:

Remove the deprecated dport* procs. Not sure if the portmgr stuff even still works, just did a basic search and replace.

File:
1 edited

Legend:

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

    r46958 r49059  
    123123        set result {}
    124124       
    125         if {[catch {set search [dportsearch "^$portname\$"]} error]} {
     125        if {[catch {set search [mportsearch "^$portname\$"]} error]} {
    126126                global errorInfo
    127127                ui_debug "$errorInfo"
     
    210210}
    211211
    212 if {[catch {dportinit ui_options options variations} result]} {
     212if {[catch {mportinit ui_options options variations} result]} {
    213213    puts "Failed to initialize ports system, $result"
    214214    exit 1
     
    224224foreach pname $argv {
    225225
    226 if {[catch {set allpackages [dportsearch "^${pname}\$"]} result]} {
     226if {[catch {set allpackages [mportsearch "^${pname}\$"]} result]} {
    227227        puts "port search failed: $result"
    228228        exit 1
     
    438438                if {![file exists /bin/${prebuild}] && ![file exists /usr/bin/${prebuild}]} {
    439439                        ui_msg "--->  Pre-installing ${prebuild}"
    440                         if {[catch {set search [dportsearch "^${prebuild}\$"]} error]} {
     440                        if {[catch {set search [mportsearch "^${prebuild}\$"]} error]} {
    441441                                global errorInfo
    442442                                ui_debug "$errorInfo"
     
    445445                        array set prebuildinfo [lindex $search 1]
    446446                        set ui_options(ports_verbose) yes
    447                         if {[catch {set workername [dportopen $prebuildinfo(porturl) [array get options] [array get variations] yes]} result] ||
     447                        if {[catch {set workername [mportopen $prebuildinfo(porturl) [array get options] [array get variations] yes]} result] ||
    448448                                $result == 1} {
    449449                                global errorInfo
     
    452452                                exit 1
    453453                        }
    454                         if {[catch {set result [dportexec $workername install]} result] ||
     454                        if {[catch {set result [mportexec $workername install]} result] ||
    455455                                $result == 1} {
    456456                                global errorInfo
    457457                                ui_debug "$errorInfo"
    458458                                ui_error "installation of ${prebuild} failed: $result"
    459                                 dportclose $workername
     459                                mportclose $workername
    460460                                exit 1
    461461                        }
     
    465465        # Turn on verbose output for the build
    466466        set ui_options(ports_verbose) yes
    467         if {[catch {set workername [dportopen $porturl [array get options] [array get variations]]} result] ||
     467        if {[catch {set workername [mportopen $porturl [array get options] [array get variations]]} result] ||
    468468                $result == 1} {
    469469                global errorInfo
     
    472472            continue
    473473        }
    474         if {[catch {set result [dportexec $workername rpmpackage]} result] ||
     474        if {[catch {set result [mportexec $workername rpmpackage]} result] ||
    475475                $result == 1} {
    476476                global errorInfo
    477477                ui_debug "$errorInfo"
    478478            ui_error "port package failed: $result"
    479                 dportclose $workername
     479                mportclose $workername
    480480            continue
    481481        }
     
    483483        # Turn verbose output off after the build
    484484
    485         dportclose $workername
     485        mportclose $workername
    486486
    487487        # We made it to the end.  We can delete the log file.
Note: See TracChangeset for help on using the changeset viewer.