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

Fixing broken add_job test.

Browse source
This commit is contained in:
Gareth J. Greenaway 2019-03-01 11:38:01 -08:00
parent 72466a53bd
commit 9e7e4ed90e
No known key found for this signature in database
GPG key ID: 10B62F8A7CAD7A41
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
salt/utils/schedule.py
View file

@ -357,7 +357,7 @@ class Schedule(object):
# assume job is enabled.
for job in data:
if 'enabled' not in data[job]:
data[job]['_enabled'] = True
data[job]['enabled'] = True
new_job = next(six.iterkeys(data))
@ -1600,11 +1600,11 @@ class Schedule(object):
# If there is no job specific enabled available,
# grab the global which defaults to True.
if 'enabled' not in data:
data['_enabled'] = self.enabled
data['enabled'] = self.enabled
# If globally disabled, disable the job
if not self.enabled:
data['_enabled'] = self.enabled
data['enabled'] = self.enabled
data['_skip_reason'] = 'disabled'
data['_skipped_time'] = now
data['_skipped'] = True
@ -1626,7 +1626,7 @@ class Schedule(object):
try:
if run:
# Job is disabled, continue
if '_enabled' in data and not data['_enabled']:
if 'enabled' in data and not data['enabled']:
log.debug('Job: %s is disabled', job_name)
data['_skip_reason'] = 'disabled'
data['_skipped_time'] = now