lili/amodem
1
0
Fork 0
mirror of https://github.com/romanz/amodem.git synced 2026-04-19 04:36:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

main: remove git-config parsing code

Browse Source
This commit is contained in:
Roman Zeyde
2016-02-15 20:52:44 +02:00
parent 2b047f0525
commit cd4cc059d6
1 changed files with 0 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
trezor_agent/__main__.py
View File

@@ -2,8 +2,6 @@ import argparse
import functools import functools
import logging import logging
import os import os
import re
import subprocess
import sys import sys
from . import formats, protocol, server, client from . import formats, protocol, server, client
@@ -11,34 +9,6 @@ from . import formats, protocol, server, client
log = logging.getLogger(__name__) log = logging.getLogger(__name__)
def identity_from_gitconfig():
out = subprocess.check_output(args='git config --list --local'.split())
config = [line.split('=', 1) for line in out.strip().split('\n')]
config_dict = dict(item for item in config if len(item) == 2)
name_regex = re.compile(r'^remote\..*\.trezor$')
names = [item[0] for item in config if name_regex.match(item[0])]
if len(names) != 1:
log.error('please add "trezor" key '
'to a single remote section at .git/config')
sys.exit(1)
key_name = names[0]
identity_label = config_dict.get(key_name)
if identity_label:
return identity_label
# extract remote name marked as TREZOR's
section_name, _ = key_name.rsplit('.', 1)
key_name = section_name + '.url'
url = config_dict[key_name]
log.debug('using "%s=%s" from git-config', key_name, url)
user, url = url.split('@', 1)
host, path = url.split(':', 1)
return 'ssh://{0}@{1}/{2}'.format(user, host, path)
def ssh_args(label): def ssh_args(label):
identity = client.string_to_identity(label, identity_type=dict) identity = client.string_to_identity(label, identity_type=dict)
@@ -98,12 +68,6 @@ def run_agent(client_factory):
label = args.identity label = args.identity
command = args.command command = args.command
if label == 'git':
label = identity_from_gitconfig()
log.info('using identity %r for git command %r', label, command)
if command:
command = ['git'] + command
public_key = conn.get_public_key(label=label) public_key = conn.get_public_key(label=label)
if args.connect: if args.connect: