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

reindent block to isolate conflict on merge forward

Browse source 
Signed-off-by: Mathieu Le Marec - Pasquet <kiorky@cryptelium.net>
This commit is contained in:
Mathieu Le Marec - Pasquet 2015-06-04 13:59:46 +02:00
parent 699eceab64
commit 1c0cd459f8
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
salt/states/pkg.py
View file

@ -1270,11 +1270,10 @@ def latest(
log.error(msg)
problems.append(msg)
elif not cur[pkg] \
or salt.utils.compare_versions(
ver1=cur[pkg],
oper='<',
ver2=avail[pkg],
cmp_func=cmp_func):
or salt.utils.compare_versions(ver1=cur[pkg],
oper='<',
ver2=avail[pkg],
cmp_func=cmp_func):
targets[pkg] = avail[pkg]
if problems: