cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

display: use stdout for column width (#70199)

Browse source 
stdout may differ from stdin so it should be used to determine the column
width, especially since it is the target file descriptor.
This commit is contained in:
Pavel Březina 2020-06-25 09:27:24 +02:00 committed by GitHub
parent 3fe48ecba2
commit 45e0f74702
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelogs/fragments/display-stdout-column-width.yml Normal file
View file

@ -0,0 +1,2 @@
bugfixes:
- Ansible output now uses stdout to determine column width instead of stdin

4
lib/ansible/utils/display.py
View file

@ -530,8 +530,8 @@ class Display(with_metaclass(Singleton, object)):
return encoding return encoding
def _set_column_width(self): def _set_column_width(self):
if os.isatty(0): if os.isatty(1):
tty_size = unpack('HHHH', fcntl.ioctl(0, TIOCGWINSZ, pack('HHHH', 0, 0, 0, 0)))[1] tty_size = unpack('HHHH', fcntl.ioctl(1, TIOCGWINSZ, pack('HHHH', 0, 0, 0, 0)))[1]
else: else:
tty_size = 0 tty_size = 0
self.columns = max(79, tty_size - 1) self.columns = max(79, tty_size - 1)