mirror of
https://github.com/saltstack/salt.git
synced 2025-04-17 10:10:20 +00:00
salt-call: account for instances where __pillar__ is empty
A regression was introduced in 8d6fdb7
, which modified pillar handling
for salt-call so that we would not recompile pillar data if it was
compiled already at the time that states were being run. But this didn't
account for instances where pillar had yet to be compiled at all, and
thus the __pillar__ dict would be empty. This commit contains a one-line
fix that fixes the regression.
This commit is contained in:
parent
a66cd67d15
commit
a9db8becea
1 changed files with 1 additions and 1 deletions
|
@ -662,7 +662,7 @@ class State(object):
|
|||
.format(', '.join(VALID_PILLAR_ENC))
|
||||
)
|
||||
self._pillar_enc = pillar_enc
|
||||
if initial_pillar is not None:
|
||||
if initial_pillar:
|
||||
self.opts['pillar'] = initial_pillar
|
||||
if self._pillar_override:
|
||||
self.opts['pillar'] = salt.utils.dictupdate.merge(
|
||||
|
|
Loading…
Add table
Reference in a new issue