valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Restore old refresh logic (#34098)

Browse Source 
This was erroneously changed in aa29744, causing a refresh to not be
performed when refresh is set to None (or not passed to
pkg.latest/pkg.installed states).
This commit is contained in:
Erik Johnson 2016-06-17 17:41:59 -05:00 committed by Nicole Thomas
parent 92dc7936ca
commit 6f03d06cc7
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
salt/states/pkg.py
View File

@ -1029,9 +1029,10 @@ def installed(
kwargs['saltenv'] = __env__
rtag = __gen_rtag()
refresh = bool(salt.utils.is_true(refresh) or
(os.path.isfile(rtag) and salt.utils.is_true(refresh))
)
refresh = bool(
salt.utils.is_true(refresh) or
(os.path.isfile(rtag) and refresh is not False)
)
if not isinstance(pkg_verify, list):
pkg_verify = pkg_verify is True
if (pkg_verify or isinstance(pkg_verify, list)) \
@ -1515,9 +1516,10 @@ def latest(
'''
rtag = __gen_rtag()
refresh = bool(salt.utils.is_true(refresh) or
(os.path.isfile(rtag) and salt.utils.is_true(refresh))
)
refresh = bool(
salt.utils.is_true(refresh) or
(os.path.isfile(rtag) and refresh is not False)
)
if kwargs.get('sources'):
return {'name': name,