openstack/deb-python-pygit2
Code Issues Proposed changes

Use ssh_agent when pub+priv key are None, not based on the class

Browse Source
This commit is contained in:
Ash Berlin
2014-10-07 09:47:59 +01:00
parent 3e87adaccd
commit 9aa39aafbc
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pygit2/remote.py
View File

@@ -456,11 +456,10 @@ def get_credentials(fn, url, username, allowed):
to_bytes(passwd)) to_bytes(passwd))
elif cred_type == C.GIT_CREDTYPE_SSH_KEY: elif cred_type == C.GIT_CREDTYPE_SSH_KEY:
if isinstance(creds, KeypairFromAgent):
username = creds.credential_tuple[0]
err = C.git_cred_ssh_key_from_agent(ccred, to_bytes(username))
else:
name, pubkey, privkey, passphrase = creds.credential_tuple name, pubkey, privkey, passphrase = creds.credential_tuple
if pubkey is None and privkey is None:
err = C.git_cred_ssh_key_from_agent(ccred, to_bytes(name))
else:
err = C.git_cred_ssh_key_new(ccred, to_bytes(name), err = C.git_cred_ssh_key_new(ccred, to_bytes(name),
to_bytes(pubkey), to_bytes(privkey), to_bytes(pubkey), to_bytes(privkey),
to_bytes(passphrase)) to_bytes(passphrase))