From 88aab20376abb33c7bcc5dc20f7b4d812b20077d Mon Sep 17 00:00:00 2001 From: Luflosi Date: Thu, 18 Oct 2018 12:20:22 +0200 Subject: [PATCH] Loop through lines of tic output to correctly handle multiple lines --- setup.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/setup.py b/setup.py index 5e9ee5e79..eb077c4f4 100755 --- a/setup.py +++ b/setup.py @@ -601,9 +601,9 @@ def package(args, for_bundle=False, sh_launcher=False): safe_makedirs(odir) proc = subprocess.run(['tic', '-x', '-o' + odir, 'terminfo/kitty.terminfo'], check=True, stderr=subprocess.PIPE) regex = '^"terminfo/kitty.terminfo", line [0-9]+, col [0-9]+, terminal \'xterm-kitty\': older tic versions may treat the description field as an alias$' - err_msg = proc.stderr.decode('utf-8').rstrip() - if not re.match(regex, err_msg): - print(err_msg, file=sys.stderr) + for error in proc.stderr.decode('utf-8').splitlines(): + if not re.match(regex, error): + print(error, file=sys.stderr) if not glob.glob(os.path.join(odir, '*/xterm-kitty')): raise SystemExit('tic failed to output the compiled kitty terminfo file') shutil.copy2('__main__.py', libdir)