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 #38313 from dragon788/2016.3-chocolatey-fix

Browse source 
2016.3 chocolatey fix
This commit is contained in:
Mike Place 2016-12-16 10:20:39 -07:00 • committed by GitHub
commit 235682b1e6
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
salt/modules/chocolatey.py
View file

@ -255,6 +255,7 @@ def list_(narrow=None,
cmd.extend(['-source', source])
if local_only:
cmd.extend(['-localonly'])
cmd.extend(['-limitoutput'])
result = __salt__['cmd.run_all'](cmd, python_shell=False)
@ -264,7 +265,7 @@ def list_(narrow=None,
raise CommandExecutionError(err)
ret = {}
pkg_re = re.compile(r'(\S+)\s+(\S+)')
pkg_re = re.compile(r'(\S+)\|(\S+)')
for line in result['stdout'].split('\n'):
if line.startswith("No packages"):
return ret

4
salt/states/chocolatey.py
View file

@ -86,7 +86,7 @@ def installed(name, version=None, source=None, force=False, pre_versions=False,
'comment': ''}
# Determine if the package is installed
if name not in __salt__['cmd.run']('choco list --local-only'):
if name not in __salt__['cmd.run']('choco list --local-only --limit-output'):
ret['changes'] = {'name': '{0} will be installed'.format(name)}
elif force:
ret['changes'] = {'name': '{0} is already installed but will reinstall'
@ -166,7 +166,7 @@ def uninstalled(name, version=None, uninstall_args=None, override_args=False):
'comment': ''}
# Determine if package is installed
if name in __salt__['cmd.run']('choco list --local-only'):
if name in __salt__['cmd.run']('choco list --local-only --limit-output'):
ret['changes'] = {'name': '{0} will be removed'.format(name)}
else:
ret['comment'] = 'The package {0} is not installed'.format(name)