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

Fix git state identity lacking of user expansion #48461 and #48462

Browse Source
This commit is contained in:
Damien Degois 2018-07-26 08:24:33 +02:00
parent fb5d63da16
commit c799ee2f7a
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
salt/states/git.py
View File

@ -664,6 +664,7 @@ def latest(name,
identity = [identity] identity = [identity]
elif not isinstance(identity, list): elif not isinstance(identity, list):
return _fail(ret, 'identity must be either a list or a string') return _fail(ret, 'identity must be either a list or a string')
identity = [os.path.expanduser(x) for x in identity]
for ident_path in identity: for ident_path in identity:
if 'salt://' in ident_path: if 'salt://' in ident_path:
try: try:
@ -2315,6 +2316,7 @@ def detached(name,
identity = [identity] identity = [identity]
elif not isinstance(identity, list): elif not isinstance(identity, list):
return _fail(ret, 'Identity must be either a list or a string') return _fail(ret, 'Identity must be either a list or a string')
identity = [os.path.expanduser(x) for x in identity]
for ident_path in identity: for ident_path in identity:
if 'salt://' in ident_path: if 'salt://' in ident_path:
try: try: