valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #12009 from fictivekin/allow-multiple-git-ids

Browse Source 
Allow multiple identities for git
This commit is contained in:
Thomas S Hatch 2014-04-16 12:19:56 -06:00
commit e51b1c81e7
1 changed files with 39 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
salt/modules/git.py
View File

@ -35,24 +35,49 @@ def _git_run(cmd, cwd=None, runas=None, identity=None, **kwargs):
env = {}
if identity:
env = {
'GIT_SSH': os.path.join(utils.templates.TEMPLATE_DIRNAME,
'git/ssh-id-wrapper'),
'GIT_IDENTITY': identity
}
stderrs = []
result = __salt__['cmd.run_all'](cmd,
cwd=cwd,
runas=runas,
env=env,
**kwargs)
# if the statefile provides multiple identities, they need to be tried
# (but also allow a string instead of a list)
if not isinstance(identity, list):
# force it into a list
identity = [identity]
retcode = result['retcode']
# try each of the identities, independently
for id_file in identity:
env = {
'GIT_SSH': os.path.join(utils.templates.TEMPLATE_DIRNAME,
'git/ssh-id-wrapper'),
'GIT_IDENTITY': id_file
}
result = __salt__['cmd.run_all'](cmd,
cwd=cwd,
runas=runas,
env=env,
**kwargs)
# if the command was successful, no need to try additional IDs
if result['retcode'] == 0:
return result['stdout']
else:
stderrs.append(result['stderr'])
# we've tried all IDs and still haven't passed, so error out
raise exceptions.CommandExecutionError("\n\n".join(stderrs))
if retcode == 0:
return result['stdout']
else:
raise exceptions.CommandExecutionError(result['stderr'])
result = __salt__['cmd.run_all'](cmd,
cwd=cwd,
runas=runas,
env=env,
**kwargs)
retcode = result['retcode']
if retcode == 0:
return result['stdout']
else:
raise exceptions.CommandExecutionError(result['stderr'])
def _git_getdir(cwd, user=None):