MB-70730 Merge branch 'trinity' into 'morpheus'

* trinity:
  MB-70730 Fix crash from progress bar getting win size

Change-Id: I4e58e87674b2a44507b59d23336c8f9a654ae634

Author: matthallcb

pbar.py

@@ -65,7 +65,7 @@ def get_terminal_width():
         def ioctl_gwinsz(fd):
             """Gets the windows size for a given file descriptor"""
             try:
-                return struct.unpack('hh', fcntl.ioctl(fd, termios.TIOCGWINSZ, '1234'))
+                return termios.tcgetwinsize(fd)
             except BaseException:
                 return None
 
@@ -78,6 +78,9 @@ def ioctl_gwinsz(fd):
             except BaseException:
                 return None, None, None, None
 
+        if window_size is None:
+            return None, None, None, None
+
         return int(window_size[1]), int(window_size[0]), 0, 0
 
     def bold(text):