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 4

fix broken tests.

Browse source
This commit is contained in:
Gareth J. Greenaway 2023-02-14 11:55:56 -08:00 • committed by Megan Wilhite
parent 171a9e33d5
commit 3fcb1e225e
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
salt/utils/schedule.py
View file

@ -208,12 +208,12 @@ class Schedule:
pillar_schedule = self.opts.get("pillar", {}).get("schedule", {})
if not isinstance(pillar_schedule, dict):
raise ValueError("Schedule must be of type dict.")
schedule.update(copy.deepcopy(pillar_schedule))
schedule.update(pillar_schedule)
if include_opts:
opts_schedule = self.opts.get("schedule", {})
if not isinstance(opts_schedule, dict):
raise ValueError("Schedule must be of type dict.")
schedule.update(copy.deepcopy(opts_schedule))
schedule.update(opts_schedule)
if remove_hidden:
_schedule = copy.deepcopy(schedule)