From a274de30b83c81c4bfd83525d0c81f2554a16e7a Mon Sep 17 00:00:00 2001 From: Roman Zeyde Date: Sat, 30 Jun 2018 13:05:21 +0300 Subject: [PATCH] Parse NeoPG development versions e.g. v0.0.5-37-g1fe5046-dirty --- libagent/gpg/keyring.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libagent/gpg/keyring.py b/libagent/gpg/keyring.py index 21e0d3c..72f358c 100644 --- a/libagent/gpg/keyring.py +++ b/libagent/gpg/keyring.py @@ -225,7 +225,9 @@ def gpg_version(sp=subprocess): args = gpg_command(['--version']) output = check_output(args=args, sp=sp) line = output.split(b'\n')[0] # b'gpg (GnuPG) 2.1.11' - return line.split(b' ')[-1] # b'2.1.11' + line = line.split(b' ')[-1] # b'2.1.11' + line = line.split(b'-')[0] # remove trailing version parts + return line.split(b'v')[-1] # remove 'v' prefix def export_public_key(user_id, env=None, sp=subprocess):