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 #38598 from terminalmage/issue38459

Browse source 
Avoid errors when sudo_user is set
This commit is contained in:
Mike Place 2017-01-05 16:16:21 -07:00 • committed by GitHub
commit a27fdb46a7
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
salt/states/archive.py
View file

@ -869,6 +869,7 @@ def extracted(name,
else:
source_sum = {}
concurrent = bool(__opts__.get('sudo_user'))
if not source_is_local and not os.path.isfile(cached_source):
if __opts__['test']:
ret['result'] = None
@ -885,7 +886,8 @@ def extracted(name,
source_hash_name=source_hash_name,
makedirs=True,
skip_verify=skip_verify,
saltenv=__env__)
saltenv=__env__,
concurrent=concurrent)
log.debug('file.managed: {0}'.format(file_result))
# Prevent a traceback if errors prevented the above state from getting
@ -1333,7 +1335,8 @@ def extracted(name,
user=user,
group=group,
recurse=recurse,
test=__opts__['test'])
test=__opts__['test'],
concurrent=concurrent)
try:
dir_result = dir_result[next(iter(dir_result))]
except AttributeError: