From 68dd9c17d5d3aeaa8196d5e31256ccb95429ac2e Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Mon, 21 Dec 2020 13:40:53 +0100 Subject: generate-alt-random: ioctl(TIOCGWINSZ) may fail in run inside a container MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This _should_ only happen when we’re doing a partial PGO build, since then the script is run in the parent terminal. In this case, the user is expected to use --rows/--cols anyway. --- scripts/generate-alt-random-writes.py | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) (limited to 'scripts') diff --git a/scripts/generate-alt-random-writes.py b/scripts/generate-alt-random-writes.py index 202c99c5..2e51082b 100755 --- a/scripts/generate-alt-random-writes.py +++ b/scripts/generate-alt-random-writes.py @@ -37,11 +37,17 @@ def main(): opts = parser.parse_args() out = opts.out if opts.out is not None else sys.stdout - lines, cols, height, width = struct.unpack( - 'HHHH', - fcntl.ioctl(sys.stdout.fileno(), - termios.TIOCGWINSZ, - struct.pack('HHHH', 0, 0, 0, 0))) + try: + lines, cols, height, width = struct.unpack( + 'HHHH', + fcntl.ioctl(sys.stdout.fileno(), + termios.TIOCGWINSZ, + struct.pack('HHHH', 0, 0, 0, 0))) + except OSError: + lines = None + cols = None + height = None + width = None if opts.rows is not None: lines = opts.rows @@ -50,6 +56,9 @@ def main(): cols = opts.cols width = 8 * cols # PGO help binary hardcodes cell width to 8px + if lines is None or cols is None or height is None or width is None: + raise Exception('could not get terminal width/height; use --rows and --cols') + # Number of characters to write to screen count = 256 * 1024**1 -- cgit v1.3