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 #42534 from jmarinaro/2017.7

Browse source 
Fixes AttributeError thrown by chocolatey state
This commit is contained in:
Mike Place 2017-07-27 12:59:50 -05:00 • committed by GitHub
commit 62ae12bcd9
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
salt/states/chocolatey.py
View file

@ -92,7 +92,7 @@ def installed(name, version=None, source=None, force=False, pre_versions=False,
# Determine action
# Package not installed
if name not in [package.split('|')[0].lower() for package in pre_install.splitlines()]:
if name.lower() not in [package.lower() for package in pre_install.keys()]:
if version:
ret['changes'] = {name: 'Version {0} will be installed'
''.format(version)}
@ -193,9 +193,13 @@ def uninstalled(name, version=None, uninstall_args=None, override_args=False):
pre_uninstall = __salt__['chocolatey.list'](local_only=True)
# Determine if package is installed
if name in [package.split('|')[0].lower() for package in pre_uninstall.splitlines()]:
ret['changes'] = {name: '{0} version {1} will be removed'
''.format(name, pre_uninstall[name][0])}
if name.lower() in [package.lower() for package in pre_uninstall.keys()]:
try:
ret['changes'] = {name: '{0} version {1} will be removed'
''.format(name, pre_uninstall[name][0])}
except KeyError:
ret['changes'] = {name: '{0} will be removed'
''.format(name)}
else:
ret['comment'] = 'The package {0} is not installed'.format(name)
return ret