saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #36546 from rallytime/fix-36514

Browse source 
Mercurial Module: Pass the identity_path portion as own arg
This commit is contained in:
Mike Place 2016-09-26 18:44:30 +09:00 • committed by GitHub
commit ab50cde391
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
salt/modules/hg.py
View file

@ -23,7 +23,7 @@ def __virtual__():
def _ssh_flag(identity_path):
return '--ssh "ssh -i {0}"'.format(identity_path)
return ['--ssh', 'ssh -i {0}'.format(identity_path)]
def revision(cwd, rev='tip', short=False, user=None):
@ -181,7 +181,7 @@ def pull(cwd, opts=None, user=None, identity=None, repository=None):
'''
cmd = ['hg', 'pull']
if identity:
cmd.append(_ssh_flag(identity))
cmd.extend(_ssh_flag(identity))
if opts:
for opt in opts.split():
cmd.append(opt)
@ -250,7 +250,7 @@ def clone(cwd, repository, opts=None, user=None, identity=None):
for opt in opts.split():
cmd.append('{0}'.format(opt))
if identity:
cmd.append(_ssh_flag(identity))
cmd.extend(_ssh_flag(identity))
return __salt__['cmd.run'](cmd, runas=user, python_shell=False)