Changeset 112646


Ignore:
Timestamp:
Oct 28, 2013, 9:31:12 PM (7 years ago)
Author:
cal@…
Message:

portutil: do not use trace mode on uninstall because it will fail, redirect reinplace sed(1) stderr to itself to avoid Tcl exec aborting on stderr output (such as from tracemode debug output)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/base/src/port1.0/portutil.tcl

    r112590 r112646  
    998998            lappend cmdline -n
    999999        }
    1000         set cmdline [concat $cmdline [list $pattern < $file >@ $tmpfd]]
     1000        set cmdline [concat $cmdline [list $pattern < $file >@ $tmpfd 2>@stderr]]
    10011001        if {$locale != ""} {
    10021002            set env(LC_CTYPE) $locale
     
    13981398                  && [info exists ports_trace]
    13991399                  && $ports_trace == "yes"
    1400                   && $target != "clean")} {
     1400                  && $target ne "clean"
     1401                  && $target ne "uninstall")} {
     1402                    # uninstall will open a portfile from registry and call
     1403                    # deactivate and uninstall there; if we enable trace mode
     1404                    # for the first level the two trace threads will conflict
     1405                    # and cause a deadlock.
    14011406                    porttrace::trace_start $workpath
    14021407
    14031408                    # Enable the fence to prevent any creation/modification
    14041409                    # outside the sandbox.
    1405                     if {$target != "activate"
    1406                       && $target != "archive"
    1407                       && $target != "install"} {
     1410                    if {$target ne "activate"
     1411                      && $target ne "archive"
     1412                      && $target ne "install"} {
    14081413                        porttrace::trace_enable_fence
    14091414                    }
     
    15171522                if {[info exists ports_trace]
    15181523                  && $ports_trace == "yes"
    1519                   && $target!="clean"} {
     1524                  && $target ne "clean"
     1525                  && $target ne "uninstall"} {
    15201526
    15211527                    tracelib closesocket
Note: See TracChangeset for help on using the changeset viewer.