summaryrefslogtreecommitdiffstats
path: root/meta/lib
diff options
context:
space:
mode:
authorMike Crowe <mac@mcrowe.com>2018-11-22 10:14:08 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-11-22 12:19:26 +0000
commit07b59afd52244410d8d833e6dfe262d952e5e344 (patch)
treebbe588ea0cd5324bed274080eeee045ec1b26113 /meta/lib
parent3df9ee85ce7fe52f0893fd33aea3bf1fcc6ead0a (diff)
downloadopenembedded-core-contrib-07b59afd52244410d8d833e6dfe262d952e5e344.tar.gz
openembedded-core-contrib-07b59afd52244410d8d833e6dfe262d952e5e344.tar.bz2
openembedded-core-contrib-07b59afd52244410d8d833e6dfe262d952e5e344.zip
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. Signed-off-by: Mike Crowe <mac@mcrowe.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib')
-rw-r--r--meta/lib/oe/terminal.py2
1 files changed, 2 insertions, 0 deletions
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():