From 1402918bb3041bfd31d87521ec81006afae2bd33 Mon Sep 17 00:00:00 2001 From: Roman Zeyde Date: Fri, 22 Apr 2016 21:36:56 +0300 Subject: [PATCH] gpg: use user name instead of key id --- gpg/git_gpg_wrapper.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/gpg/git_gpg_wrapper.py b/gpg/git_gpg_wrapper.py index 679a0c2..130ea55 100755 --- a/gpg/git_gpg_wrapper.py +++ b/gpg/git_gpg_wrapper.py @@ -7,16 +7,20 @@ import os import signer -logging.basicConfig(level=logging.DEBUG, - format='%(asctime)s %(levelname)-10s %(message)s') +log = logging.getLogger(__name__) + def main(): + logging.basicConfig(level=logging.INFO, + format='%(asctime)s %(levelname)-10s %(message)s') + + log.debug('sys.argv: %s', sys.argv) args = sys.argv[1:] if '--verify' in args: sp.check_call(['gpg2'] + args) else: - user_id = os.environ['GPG_USER_ID'] - user_id = user_id.encode('ascii') + command, user_id = args + assert command == '-bsau' # --detach-sign --sign --armor --local-user pubkey = signer.load_from_gpg(user_id) s = signer.Signer(user_id=user_id, created=pubkey['created']) assert s.key_id() == pubkey['key_id']