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

Browse source 
Avoid errors when sudo_user is set (2016.3 branch)
This commit is contained in:
Mike Place 2017-01-05 13:57:08 -07:00 • committed by GitHub
commit 224fc7712a
3 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
salt/modules/vbox_guest.py
View file

@ -101,19 +101,22 @@ def _additions_install_opensuse(**kwargs):
r'^(\d|\.|-)*', '', __grains__.get('kernelrelease', ''))
kernel_devel = 'kernel-{0}-devel'.format(kernel_type)
ret = __salt__['state.single']('pkg.installed', 'devel packages',
pkgs=['make', 'gcc', kernel_devel])
pkgs=['make', 'gcc', kernel_devel],
concurrent=bool(__opts__.get('sudo_user')))
return ret
def _additions_install_ubuntu(**kwargs):
ret = __salt__['state.single']('pkg.installed', 'devel packages',
pkgs=['dkms', ])
pkgs=['dkms', ],
concurrent=bool(__opts__.get('sudo_user')))
return ret
def _additions_install_fedora(**kwargs):
ret = __salt__['state.single']('pkg.installed', 'devel packages',
pkgs=['dkms', 'gcc'])
pkgs=['dkms', 'gcc'],
concurrent=bool(__opts__.get('sudo_user')))
return ret

7
salt/states/archive.py
View file

@ -343,6 +343,7 @@ def extracted(name,
__env__,
'{0}.{1}'.format(re.sub('[:/\\\\]', '_', if_missing), archive_format))
concurrent = bool(__opts__.get('sudo_user'))
if not source_is_local and not os.path.isfile(filename):
if __opts__['test']:
ret['result'] = None
@ -363,7 +364,8 @@ def extracted(name,
makedirs=True,
skip_verify=skip_verify,
saltenv=__env__,
source_hash_name=source_hash_name)
source_hash_name=source_hash_name,
concurrent=concurrent)
log.debug('file.managed: {0}'.format(file_result))
# get value of first key
try:
@ -527,7 +529,8 @@ def extracted(name,
if_missing,
user=user,
group=group,
recurse=recurse)
recurse=recurse,
concurrent=concurrent)
log.debug('file.directory: %s', dir_result)
elif os.path.isfile(if_missing):
log.debug('if_missing (%s) is a file, not enforcing user/group '

3
salt/states/dockerio.py
View file

@ -507,7 +507,8 @@ def loaded(name, tag='latest', source=None, source_hash='', force=False):
__salt__['state.single']('file.managed',
name=tmp_filename,
source=source,
source_hash=source_hash)
source_hash=source_hash,
concurrent=bool(__opts__.get('sudo_user')))
changes = {}
if image_infos['status']: