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

Merge pull request #31691 from rallytime/bp-31261

Browse Source 
Back-port #31261 to 2016.3
This commit is contained in:
Mike Place 2016-03-07 07:44:13 -07:00
commit d7401e9ea4
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

@ -127,7 +127,16 @@ def list_(show_all=False,
continue
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: