Permalink
Browse files

Adress #1000 with check for bad passed data in confirm_top

  • Loading branch information...
1 parent d05a600 commit 96df9de51a9de48290583d370849435fc2ee0e5b @thatch45 thatch45 committed Mar 25, 2012
Showing with 4 additions and 0 deletions.
  1. +4 −0 salt/minion.py
View
@@ -572,6 +572,10 @@ def confirm_top(self, match, data, nodegroups=None):
data matches this minion
'''
matcher = 'glob'
+ if not data:
+ log.error('Recived bad data when setting the match from the top '
+ 'file')
+ return False
for item in data:
if isinstance(item, dict):
if 'match' in item:

0 comments on commit 96df9de

Please sign in to comment.