Changeset 29505 for trunk/base


Ignore:
Timestamp:
Sep 26, 2007, 5:07:00 AM (12 years ago)
Author:
jmpp@…
Message:
  • Adapt to new macports1.0 UI API: global reference to ui_options in custom ui_channels proc is no longer needed;
  • In getpasswd proc: bring lockfile and lockfile_fd vars into scope so that we can properly clean the corresponding file should we need to;
  • In getpasswd proc: improve the error message for the missing password case.
File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/base/portmgr/PortIndex2MySQL.tcl

    r29502 r29505  
    9797# UI instantiation to route information/error messages wherever we want.
    9898proc ui_channels {priority} {
    99     global ui_options runlog_fd
     99    global runlog_fd
    100100    switch $priority {
    101101        debug {
     
    163163proc getpasswd {passwdfile} {
    164164    if {[catch {open $passwdfile r} passwdfile_fd]} {
     165        global lockfile lockfile_fd
    165166        ui_error "${::errorCode}: $passwdfile_fd"
    166167        cleanup lockfile
     
    168169    }
    169170    if {[gets $passwdfile_fd passwd] <= 0} {
     171        global lockfile lockfile_fd
    170172        close $passwdfile_fd
    171         ui_error "No password found in $passwdfile!"
     173        ui_error "No password found in password file $passwdfile!"
    172174        cleanup lockfile
    173175        terminate 1
Note: See TracChangeset for help on using the changeset viewer.