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

Back-port #32396 to 2016.3 #34095

Merged
merged 2 commits into from
Jun 21, 2016
Merged

Back-port #32396 to 2016.3 #34095

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
20ff5c8
Unbreak cron.file
eradman Apr 6, 2016
074b6ab
Correct pylint error
eradman Apr 7, 2016
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
3 changes: 2 additions & 1 deletion salt/states/cron.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -540,6 +540,7 @@ def file(name,
__env__,
context,
defaults,
False, # skip_verify
**kwargs
)
except Exception as exc:
Expand Down Expand Up @@ -573,12 +574,12 @@ def file(name,
ret['comment'] = 'Unable to manage file: {0}'.format(exc)
return ret

cron_ret = None
if ret['changes']:
cron_ret = __salt__['cron.write_cron_file_verbose'](user, cron_path)
ret['changes'] = {'diff': ret['changes']['diff']}
ret['comment'] = 'Crontab for user {0} was updated'.format(user)
elif ret['result']:
cron_ret = None
ret['comment'] = 'Crontab for user {0} is in the correct ' \
'state'.format(user)

Expand Down