[oe-commits] [openembedded-core] 05/09: terminal: Cope with unreleased versions of tmux

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit 07b59afd52244410d8d833e6dfe262d952e5e344
Author: Mike Crowe <mac at mcrowe.com>
AuthorDate: Thu Nov 22 10:14:08 2018 +0000

    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 at mcrowe.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/lib/oe/terminal.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta/lib/oe/terminal.py b/meta/lib/oe/terminal.py
index caeb5e3..afbda59 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():

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.