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

Added logic for dealing with latest in remove

Browse source
This commit is contained in:
twangboy 2016-02-01 16:38:19 -07:00
parent c4357a6d80
commit 581a4df523
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
salt/modules/win_pkg.py
View file

@ -836,6 +836,9 @@ def remove(name=None, pkgs=None, version=None, **kwargs):
else:
version_num = version
if 'latest' in pkginfo and version_num not in pkginfo:
version_num = 'latest'
# Check to see if package is installed on the system
if target not in old:
log.error('{0} {1} not installed'.format(target, version))
@ -843,7 +846,8 @@ def remove(name=None, pkgs=None, version=None, **kwargs):
continue
else:
if not version_num == old.get(target) \
and not old.get(target) == "Not Found":
and not old.get(target) == "Not Found" \
and not version_num == 'latest':
log.error('{0} {1} not installed'.format(target, version))
ret[target] = {'current': '{0} not installed'.format(version_num)}
continue