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

Merge pull request #32718 from garethgreenaway/2015_8_schedule_list_fix

Browse source 
Fixes to schedule.list in 2015.8
This commit is contained in:
Nicole Thomas 2016-04-20 13:51:24 -06:00
commit f52af5a596
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
salt/modules/schedule.py
View file

@ -112,7 +112,16 @@ def list_(show_all=False, where=None, return_yaml=True):
schedule[job][item] = False
if '_seconds' in schedule[job]:
schedule[job]['seconds'] = schedule[job]['_seconds']
# if _seconds is greater than zero
# then include the original back in seconds.
# otherwise remove seconds from the listing as the
# original item didn't include it.
if schedule[job]['_seconds'] > 0:
schedule[job]['seconds'] = schedule[job]['_seconds']
else:
del schedule[job]['seconds']
# remove _seconds from the listing
del schedule[job]['_seconds']
if schedule: