From 9cf73f677a410747424473a9258877c374af9173 Mon Sep 17 00:00:00 2001 From: Jonathan Roelofs Date: Mon, 1 Jan 2018 23:05:37 +0000 Subject: [PATCH] Show libagent version too --- libagent/gpg/__init__.py | 6 ++++-- libagent/ssh/__init__.py | 8 +++++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/libagent/gpg/__init__.py b/libagent/gpg/__init__.py index ee544ff..a916b68 100644 --- a/libagent/gpg/__init__.py +++ b/libagent/gpg/__init__.py @@ -253,9 +253,11 @@ def main(device_type): p.add_argument('-v', '--verbose', default=0, action='count') p.set_defaults(func=run_unlock) - version = pkg_resources.require("trezor-agent")[0].version + trezoragent_ver = pkg_resources.require('trezor-agent')[0].version + libagent_ver = pkg_resources.require('libagent')[0].version + ver_str = '%(prog)s ' + trezoragent_ver + ', libagent ' + libagent_ver parser.add_argument('--version', help='Print the version info', - action='version', version='%(prog)s ' + version) + action='version', version=ver_str) args = parser.parse_args() return args.func(device_type=device_type, args=args) diff --git a/libagent/ssh/__init__.py b/libagent/ssh/__init__.py index 99711e0..5e5c443 100644 --- a/libagent/ssh/__init__.py +++ b/libagent/ssh/__init__.py @@ -61,9 +61,11 @@ def create_agent_parser(): p = configargparse.ArgParser(default_config_files=['~/.ssh/agent.config']) p.add_argument('-v', '--verbose', default=0, action='count') - version = pkg_resources.require("trezor-agent")[0].version - p.add_argument('--version', help='Print the version info', - action='version', version='%(prog)s ' + version) + trezoragent_ver = pkg_resources.require('trezor-agent')[0].version + libagent_ver = pkg_resources.require('libagent')[0].version + ver_str = '%(prog)s ' + trezoragent_ver + ', libagent ' + libagent_ver + parser.add_argument('--version', help='Print the version info', + action='version', version=ver_str) curve_names = [name for name in formats.SUPPORTED_CURVES] curve_names = ', '.join(sorted(curve_names))