jacobpascual/trezor-agent
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Show libagent version too

Browse Source
This commit is contained in:
Jonathan Roelofs
2018-01-01 23:05:37 +00:00
parent ec97cd0c44
commit 9cf73f677a
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libagent/gpg/__init__.py
View File

@@ -253,9 +253,11 @@ def main(device_type):
p.add_argument('-v', '--verbose', default=0, action='count') p.add_argument('-v', '--verbose', default=0, action='count')
p.set_defaults(func=run_unlock) 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', parser.add_argument('--version', help='Print the version info',
action='version', version='%(prog)s ' + version) action='version', version=ver_str)
args = parser.parse_args() args = parser.parse_args()
return args.func(device_type=device_type, args=args) return args.func(device_type=device_type, args=args)

8
libagent/ssh/__init__.py
View File

@@ -61,9 +61,11 @@ def create_agent_parser():
p = configargparse.ArgParser(default_config_files=['~/.ssh/agent.config']) p = configargparse.ArgParser(default_config_files=['~/.ssh/agent.config'])
p.add_argument('-v', '--verbose', default=0, action='count') p.add_argument('-v', '--verbose', default=0, action='count')
version = pkg_resources.require("trezor-agent")[0].version trezoragent_ver = pkg_resources.require('trezor-agent')[0].version
p.add_argument('--version', help='Print the version info', libagent_ver = pkg_resources.require('libagent')[0].version
action='version', version='%(prog)s ' + 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 = [name for name in formats.SUPPORTED_CURVES]
curve_names = ', '.join(sorted(curve_names)) curve_names = ', '.join(sorted(curve_names))