Skip to content

Commit

Permalink
reactor: ensure glob_ref is a string
Browse files Browse the repository at this point in the history
When path does not exist, cp.cache_file returns False, which will cause
a traceback when we attempt to glob that path.
  • Loading branch information
terminalmage committed Jan 23, 2017
1 parent 2e443d7 commit fbc4d2a
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion salt/utils/reactor.py
Expand Up @@ -58,7 +58,7 @@ def render_reaction(self, glob_ref, tag, data):
react = {}

if glob_ref.startswith('salt://'):
glob_ref = self.minion.functions['cp.cache_file'](glob_ref)
glob_ref = self.minion.functions['cp.cache_file'](glob_ref) or ''
globbed_ref = glob.glob(glob_ref)
if not globbed_ref:
log.error('Can not render SLS {0} for tag {1}. File missing or not found.'.format(glob_ref, tag))
Expand Down

0 comments on commit fbc4d2a

Please sign in to comment.