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

removing try...except, checking return of cache_file. If identity doesn't exist via Salt fileserver or local file, continue in the for loop.

Browse Source
This commit is contained in:
Gareth J. Greenaway 2015-09-26 10:21:51 -07:00
parent f639378fbf
commit fc36164ddf
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
salt/modules/git.py
View File

@ -146,15 +146,16 @@ def _git_run(command, cwd=None, runas=None, identity=None,
# try each of the identities, independently
for id_file in identity:
if 'salt://' in id_file:
try:
id_file = __salt__['cp.cache_file'](id_file)
except IOError as e:
log.debug(e)
raise CommandExecutionError(
'identity \'{0}\' does not exist.'.format(
id_file
)
)
_id_file = id_file
id_file = __salt__['cp.cache_file'](id_file)
if not id_file:
log.error('identity {0} does not exist.'.format(_id_file))
continue
else:
if not __salt__['file.file_exists'](id_file):
log.error('identity {0} does not exist.'.format(id_file))
continue
env = {
'GIT_IDENTITY': id_file
}