diff options
| author | Mikhail Naganov <mnaganov@google.com> | 2019-07-02 09:51:42 -0700 |
|---|---|---|
| committer | Luca Stefani <luca.stefani.ge1@gmail.com> | 2019-09-04 15:14:54 +0200 |
| commit | 9a7ded20549ebb04732bc66e645131e974207257 (patch) | |
| tree | ea82c7e8cd6c5fa828f227aac3ed7df5bf1b852e /ui | |
| parent | d912eb6c557fb8d14a3530fb2d76ae6ddd752fd8 (diff) | |
| download | build_soong-9a7ded20549ebb04732bc66e645131e974207257.tar.gz build_soong-9a7ded20549ebb04732bc66e645131e974207257.tar.bz2 build_soong-9a7ded20549ebb04732bc66e645131e974207257.zip | |
Perform TERM check for file writers only
Tests use fakeSmartTerminal, this case must not be affected
by the TERM setting.
Test: TERM=dumb make
Change-Id: Ib926a1c6ba2d8c4117d412fe351d872ccfc1c799
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/terminal/util.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ui/terminal/util.go b/ui/terminal/util.go index f383ef19..7a603d7f 100644 --- a/ui/terminal/util.go +++ b/ui/terminal/util.go @@ -23,10 +23,10 @@ import ( ) func isSmartTerminal(w io.Writer) bool { - if term, ok := os.LookupEnv("TERM"); ok && term == "dumb" { - return false - } if f, ok := w.(*os.File); ok { + if term, ok := os.LookupEnv("TERM"); ok && term == "dumb" { + return false + } var termios syscall.Termios _, _, err := syscall.Syscall6(syscall.SYS_IOCTL, f.Fd(), ioctlGetTermios, uintptr(unsafe.Pointer(&termios)), |