Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Restore old refresh logic #34098

Merged
merged 1 commit into from
Jun 17, 2016
Merged

Restore old refresh logic #34098

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions salt/states/pkg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)) \
Expand Down Expand Up @@ -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,
Expand Down