From bdda030127f32040df18501ccd95aac631e2335a Mon Sep 17 00:00:00 2001 From: Mike Crowe Date: Thu, 22 Nov 2018 10:14:08 +0000 Subject: terminal: Cope with unreleased versions of tmux When tmux is built from a non-release Git version, its version number is "next-X" where X appears to be the expected version number for the next release. For example, when built from the current state of master, running "tmux -V" yields: tmux next-2.9 Currently check_tmux_pane_size only checks for the version being less than 1.9, so it seems unfair to fail with an obscure Python error in this case. Let's just use the version number after the "next-" prefix if it is present. (From OE-Core rev: 07b59afd52244410d8d833e6dfe262d952e5e344) Signed-off-by: Mike Crowe Signed-off-by: Richard Purdie --- meta/lib/oe/terminal.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'meta/lib/oe/terminal.py') diff --git a/meta/lib/oe/terminal.py b/meta/lib/oe/terminal.py index caeb5e31ec..afbda595db 100644 --- a/meta/lib/oe/terminal.py +++ b/meta/lib/oe/terminal.py @@ -296,6 +296,8 @@ def check_terminal_version(terminalName): vernum = ver.split(' ')[-1] if ver.startswith('tmux'): vernum = ver.split()[-1] + if ver.startswith('tmux next-'): + vernum = ver.split()[-1][5:] return vernum def distro_name(): -- cgit v1.2.3-54-g00ecf